Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index df1f17408ce2..ed616fe3a33e 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -1688,6 +1688,8 @@ class ActivityStack extends Task {
                     ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
                             !PRESERVE_WINDOWS);
                     nothingToResume = shouldSleepActivities();
+                } else if (next.currentLaunchCanTurnScreenOn() && next.canTurnScreenOn()) {
+                    nothingToResume = false;
                 }
             }
             if (nothingToResume) {