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

Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-31 19:53:10 +00:00
committed by Android (Google) Code Review
parent 59e16c9eb9 d798853460
commit 39e8819755
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3824,20 +3824,22 @@ public class WindowManagerService extends IWindowManager.Stub
long origId = Binder.clearCallingIdentity();
try {
final boolean rotationChanged;
// TODO(multi-display): Update rotation for different displays separately.
final DisplayContent displayContent = getDefaultDisplayContentLocked();
final boolean rotationChanged;
final int displayId;
synchronized (mWindowMap) {
final DisplayContent displayContent = getDefaultDisplayContentLocked();
rotationChanged = displayContent.updateRotationUnchecked(
false /* inTransaction */);
if (!rotationChanged || forceRelayout) {
getDefaultDisplayContentLocked().setLayoutNeeded();
displayContent.setLayoutNeeded();
mWindowPlacerLocked.performSurfacePlacement();
}
displayId = displayContent.getDisplayId();
}
if (rotationChanged || alwaysSendConfiguration) {
sendNewConfiguration(displayContent.getDisplayId());
sendNewConfiguration(displayId);
}
} finally {
Binder.restoreCallingIdentity(origId);
@@ -6898,9 +6900,11 @@ public class WindowManagerService extends IWindowManager.Stub
"registerDockedStackListener()")) {
return;
}
// TODO(multi-display): The listener is registered on the default display only.
getDefaultDisplayContentLocked().mDividerControllerLocked.registerDockedStackListener(
listener);
synchronized (mWindowMap) {
// TODO(multi-display): The listener is registered on the default display only.
getDefaultDisplayContentLocked().mDividerControllerLocked.registerDockedStackListener(
listener);
}
}
@Override