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

Merge "upgrade appdied transition trigger to task if relevant" into tm-qpr-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-10-13 16:46:23 +00:00
committed by Android (Google) Code Review
parent 49adca7c38 779851dc35
commit 854d61ebb0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4076,7 +4076,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// to the restarted activity. // to the restarted activity.
nowVisible = mVisibleRequested; nowVisible = mVisibleRequested;
} }
mTransitionController.requestCloseTransitionIfNeeded(this); // upgrade transition trigger to task if this is the last activity since it means we are
// closing the task.
final WindowContainer trigger = remove && task != null && task.getChildCount() == 1
? task : this;
mTransitionController.requestCloseTransitionIfNeeded(trigger);
cleanUp(true /* cleanServices */, true /* setState */); cleanUp(true /* cleanServices */, true /* setState */);
if (remove) { if (remove) {
if (mStartingData != null && mVisible && task != null) { if (mStartingData != null && mVisible && task != null) {