Merge "Check IsSleeping to start WAKE transition" into main (d6ab40bc) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -2481,6 +2481,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		if (displayShouldSleep == display.isSleeping()) {
		continue;
		}
		final boolean wasSleeping = display.isSleeping();
		display.setIsSleeping(displayShouldSleep);

		if (display.mTransitionController.isShellTransitionsEnabled()
		@@ -2506,9 +2507,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		// Use NONE if keyguard is not showing.
		int transit = TRANSIT_NONE;
		Task startTask = null;
		if (!display.getDisplayPolicy().isAwake()) {
		// Note that currently this only happens on default display because non-default
		// display is always awake.
		if (wasSleeping) {
		transit = TRANSIT_WAKE;
		} else if (display.isKeyguardOccluded()) {
		// The display was awake so this is resuming activity for occluding keyguard.