diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 19a9b3fbb368..b562ccfb3d2b 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2481,6 +2481,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> if (displayShouldSleep == display.isSleeping()) { continue; } + final boolean wasSleeping = display.isSleeping(); display.setIsSleeping(displayShouldSleep); if (display.mTransitionController.isShellTransitionsEnabled() @@ -2506,9 +2507,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> // Use NONE if keyguard is not showing. int transit = TRANSIT_NONE; Task startTask = null; - if (!display.getDisplayPolicy().isAwake()) { - // Note that currently this only happens on default display because non-default - // display is always awake. + if (wasSleeping) { transit = TRANSIT_WAKE; } else if (display.isKeyguardOccluded()) { // The display was awake so this is resuming activity for occluding keyguard. |