Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix synchronization error for Seamless rotation.

Browse Source 
Missing synchronized block in timeout codepath.

Bug: 28823590
Change-Id: I38cff63b559b5f8cd65698af27a1100208ff2600
This commit is contained in:
Robert Carr
2016-06-30 15:20:37 -07:00
parent 606f4d5d8c
commit 0baa1bc665
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -8690,19 +8690,21 @@ public class WindowManagerService extends IWindowManager.Stub
case SEAMLESS_ROTATION_TIMEOUT: {
// Rotation only supported on primary display.
// TODO(multi-display)
final DisplayContent displayContent = getDefaultDisplayContentLocked();
final WindowList windows = displayContent.getWindowList();
boolean layoutNeeded = false;
for (int i = windows.size() - 1; i >= 0; i--) {
WindowState w = windows.get(i);
if (w.mSeamlesslyRotated) {
layoutNeeded = true;
w.setDisplayLayoutNeeded();
synchronized(mWindowMap) {
final DisplayContent displayContent = getDefaultDisplayContentLocked();
final WindowList windows = displayContent.getWindowList();
boolean layoutNeeded = false;
for (int i = windows.size() - 1; i >= 0; i--) {
WindowState w = windows.get(i);
if (w.mSeamlesslyRotated) {
layoutNeeded = true;
w.setDisplayLayoutNeeded();
}
w.mSeamlesslyRotated = false;
}
if (layoutNeeded) {
mWindowPlacerLocked.performSurfacePlacement();
}
w.mSeamlesslyRotated = false;
}
if (layoutNeeded) {
mWindowPlacerLocked.performSurfacePlacement();
}
}
break;