Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev am: 061e5065db am: f03803670d am: 2a72c9cd02

Change-Id: I362a94b7daf8183b644116d44531671f3282b97b
2020-05-04 05:10:17 +00:00
parent 7afeef708e 2a72c9cd02
commit 663ec0efb4
1 changed files with 2 additions and 0 deletions
--- 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) {