Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev (fe478ff7) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -3375,7 +3375,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		stack.goToSleepIfPossible(false /* shuttingDown */);
		} else {
		stack.awakeFromSleepingLocked();
		if (isFocusedStack(stack) && !mKeyguardController.isKeyguardLocked()) {
		if (isFocusedStack(stack)
		&& !mKeyguardController.isKeyguardShowing(display.mDisplayId)) {
		// If the keyguard is unlocked - resume immediately.
		// It is possible that the display will not be awake at the time we
		// process the keyguard going away, which can happen before the sleep token