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

Merge "Do not call setReady(false) when finishing" into sc-v2-dev am: d31dbcf198

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404739

Change-Id: I2bcf07a8b5103b4295d19cd907e656b4841115b2
This commit is contained in:
Chris Li
2021-07-30 16:18:29 +00:00
committed by Automerger Merge Worker
parent b32575b9c7 d31dbcf198
commit 6e96f0476e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3453,7 +3453,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if (stopped) { if (stopped) {
abortAndClearOptionsAnimation(); abortAndClearOptionsAnimation();
} }
mAtmService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, this); if (mAtmService.getTransitionController().isCollecting()) {
// We don't want the finishing to change the transition ready state since there will not
// be corresponding setReady for finishing.
mAtmService.getTransitionController().collectExistenceChange(this);
} else {
mAtmService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, this);
}
} }
/** /**

8
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -1551,7 +1551,13 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
return; return;
} }
if (task.isVisible()) { if (task.isVisible()) {
mService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, task); if (mService.getTransitionController().isCollecting()) {
// We don't want the finishing to change the transition ready state since there will
// not be corresponding setReady for finishing.
mService.getTransitionController().collectExistenceChange(task);
} else {
mService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, task);
}
} else { } else {
// Removing a non-visible task doesn't require a transition, but if there is one // Removing a non-visible task doesn't require a transition, but if there is one
// collecting, this should be a member just in case. // collecting, this should be a member just in case.