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

Commit ba82905d authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

am: fe478ff7

Change-Id: I104e1763ae52ac6093bf82532b2091b81da5b716
parents 6991d9df fe478ff7

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