Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-13 19:37:25 +00:00
committed by Android (Google) Code Review
parent 3ed6c6330a b3b73f2f84
commit fe478ff7ba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -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