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

Merge "Allow to transfer starting window from dying activity" into sc-v2-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-08-16 02:52:05 +00:00
committed by Android (Google) Code Review
parent d87aebcacd 56966cba35
commit a0eaed873c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3669,6 +3669,16 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} }
cleanUp(true /* cleanServices */, true /* setState */); cleanUp(true /* cleanServices */, true /* setState */);
if (remove) { if (remove) {
if (mStartingData != null && mVisible && task != null) {
// A corner case that the app terminates its trampoline activity on a separated
// process by killing itself. Transfer the starting window to the next activity
// which will be visible, so the dead activity can be removed immediately (no
// longer animating) and the reveal animation can play normally on next activity.
final ActivityRecord top = task.topRunningActivity();
if (top != null && !top.mVisible && top.shouldBeVisible()) {
top.transferStartingWindow(this);
}
}
removeFromHistory("appDied"); removeFromHistory("appDied");
} }
} }