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

Commit 18e33379 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
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
am: 905cf297

Change-Id: I244c68c86ed47e92113190265370837fe94e6523
parents 461ba614 905cf297

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3375,7 +3375,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                    stack.goToSleepIfPossible(false /* shuttingDown */);

                    stack.goToSleepIfPossible(false /* shuttingDown */);

                } else {

                } else {

                    stack.awakeFromSleepingLocked();

                    stack.awakeFromSleepingLocked();

                    if (isFocusedStack(stack) && !mKeyguardController.isKeyguardLocked()) {

                    if (isFocusedStack(stack)

                            && !mKeyguardController.isKeyguardShowing(display.mDisplayId)) {

                        // If the keyguard is unlocked - resume immediately.

                        // If the keyguard is unlocked - resume immediately.

                        // It is possible that the display will not be awake at the time we

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

                        // process the keyguard going away, which can happen before the sleep token