Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev (d63b3c46) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/KeyguardController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ class KeyguardController {
		if (showingChanged) {
		dismissDockedStackIfNeeded();
		setKeyguardGoingAway(false);
		mWindowManager.setKeyguardOrAodShowingOnDefaultDisplay(
		isKeyguardOrAodShowing(DEFAULT_DISPLAY));
		if (keyguardShowing) {
		mDismissalRequested = false;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -692,7 +692,7 @@ public class DockedStackDividerController {

		// Do not minimize when dock is already minimized while keyguard is showing and not
		// occluded such as unlocking the screen
		if (mMinimizedDock && mService.mPolicy.isKeyguardShowingAndNotOccluded()) {
		if (mMinimizedDock && mService.mKeyguardOrAodShowingOnDefaultDisplay) {
		return;
		}
		final TaskStack topSecondaryStack = mDisplayContent.getTopStackInWindowingMode(

+9 −0

Original line number	Diff line number	Diff line
		@@ -369,7 +369,10 @@ public class WindowManagerService extends IWindowManager.Stub
		final WindowTracing mWindowTracing;

		final private KeyguardDisableHandler mKeyguardDisableHandler;
		// TODO: eventually unify all keyguard state in a common place instead of having it spread over
		// AM's KeyguardController and the policy's KeyguardServiceDelegate.
		boolean mKeyguardGoingAway;
		boolean mKeyguardOrAodShowingOnDefaultDisplay;
		// VR Vr2d Display Id.
		int mVr2dDisplayId = INVALID_DISPLAY;

		@@ -2909,6 +2912,12 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}

		public void setKeyguardOrAodShowingOnDefaultDisplay(boolean showing) {
		synchronized (mWindowMap) {
		mKeyguardOrAodShowingOnDefaultDisplay = showing;
		}
		}

		// -------------------------------------------------------------
		// Misc IWindowSession methods
		// -------------------------------------------------------------