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

Merge "Avoid unexpected turning screen on when top activity finishes" into udc-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2023-06-07 03:46:37 +00:00
committed by Android (Google) Code Review
parent c3d53f821a 2af9efb275
commit f89046ffab
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -898,6 +898,11 @@ class ActivityStarter {
} }
mLastStartReason = request.reason; mLastStartReason = request.reason;
mLastStartActivityTimeMs = System.currentTimeMillis(); mLastStartActivityTimeMs = System.currentTimeMillis();
// Reset the ActivityRecord#mCurrentLaunchCanTurnScreenOn state of last start activity in
// case the state is not yet consumed during rapid activity launch.
if (mLastStartActivityRecord != null) {
mLastStartActivityRecord.setCurrentLaunchCanTurnScreenOn(false);
}
mLastStartActivityRecord = null; mLastStartActivityRecord = null;
final IApplicationThread caller = request.caller; final IApplicationThread caller = request.caller;