Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I51bad58b07d96228acac4efba682fbc31dafa218
This commit is contained in:
Riddle Hsu
2020-05-04 04:49:05 +00:00
committed by Automerger Merge Worker
parent 17a7890e7c f03803670d
commit 2a72c9cd02
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -1688,6 +1688,8 @@ class ActivityStack extends Task {
ensureActivitiesVisible(null /* starting */, 0 /* configChanges */, ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
!PRESERVE_WINDOWS); !PRESERVE_WINDOWS);
nothingToResume = shouldSleepActivities(); nothingToResume = shouldSleepActivities();
} else if (next.currentLaunchCanTurnScreenOn() && next.canTurnScreenOn()) {
nothingToResume = false;
} }
} }
if (nothingToResume) { if (nothingToResume) {