Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 905cf297 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Allow for activities to resumed if keyguard is occluded." into pi-dev am: fe478ff7" into pi-dev-plus-aosp
parents 0eb3372d ba82905d

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