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

Change-Id: Ib5dd6d81498f7166bc6509ffea0d1236086c96d5
2020-05-04 04:34:12 +00:00
parent 9812153705 061e5065db
commit f03803670d
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) {