Commit 4c522b3e authored Mar 13, 2018 by Bryce Lee Committed by android-build-team Robot Mar 13, 2018

Allow for activities to resumed if keyguard is occluded.

A previous changelist enforced that activities would not be resumed
if the keyguard is locked. However, this prevents activities that
show above the keyguard from resuming.

This changelist adjusts this check to account for occlusion.

Fixes: 74585178
Test: Lock screen, fingerprint unlock, verify activity is resumed.
Test: Set alarm, lock screen, verify alarm shows above lock screen
      resumed.

Change-Id: I9d26d6b667bb1679c373f36188a610a66d2f5b2d
(cherry picked from commit b3b73f2f)

parent f8219c1e

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