Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev (39e88197) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -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,10 +6900,12 @@ public class WindowManagerService extends IWindowManager.Stub
		"registerDockedStackListener()")) {
		return;
		}
		synchronized (mWindowMap) {
		// TODO(multi-display): The listener is registered on the default display only.
		getDefaultDisplayContentLocked().mDividerControllerLocked.registerDockedStackListener(
		listener);
		}
		}

		@Override
		public void registerPinnedStackListener(int displayId, IPinnedStackListener listener) {