Merge "Fix flicker when device is unlocked from AOD." into sc-dev (aaba1884) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -106,13 +106,13 @@ class KeyguardController {
		}

		/**
		* @return {@code true} for default display when AOD is showing. Otherwise, same as
		* {@link #isKeyguardOrAodShowing(int)}
		* @return {@code true} for default display when AOD is showing, not going away. Otherwise, same
		* as {@link #isKeyguardOrAodShowing(int)}
		* TODO(b/125198167): Replace isKeyguardOrAodShowing() by this logic.
		*/
		boolean isKeyguardUnoccludedOrAodShowing(int displayId) {
		if (displayId == DEFAULT_DISPLAY && mAodShowing) {
		return true;
		return !mKeyguardGoingAway;
		}
		return isKeyguardOrAodShowing(displayId);
		}
		@@ -477,7 +477,7 @@ class KeyguardController {
		final KeyguardDisplayState state = getDisplayState(displayId);
		if (isKeyguardUnoccludedOrAodShowing(displayId)) {
		state.mSleepTokenAcquirer.acquire(displayId);
		} else if (!isKeyguardUnoccludedOrAodShowing(displayId)) {
		} else {
		state.mSleepTokenAcquirer.release(displayId);
		}
		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -2165,6 +2165,21 @@ public class DisplayContentTests extends WindowTestsBase {
		assertEquals(top, display.topRunningActivity(true /* considerKeyguardState */));
		}

		@Test
		public void testKeyguardGoingAwayWhileAodShown() {
		mDisplayContent.getDisplayPolicy().setAwake(true);

		final WindowState appWin = createWindow(null, TYPE_APPLICATION, mDisplayContent, "appWin");
		final ActivityRecord activity = appWin.mActivityRecord;

		mAtm.mKeyguardController.setKeyguardShown(true /* keyguardShowing */,
		true /* aodShowing */);
		assertFalse(activity.isVisibleRequested());

		mAtm.mKeyguardController.keyguardGoingAway(0 /* flags */);
		assertTrue(activity.isVisibleRequested());
		}

		@Test
		public void testRemoveRootTaskInWindowingModes() {
		removeRootTaskTests(() -> mRootWindowContainer.removeRootTasksInWindowingModes(