diff options
| author | 2024-05-30 22:39:46 +0000 | |
|---|---|---|
| committer | 2024-05-30 22:39:46 +0000 | |
| commit | 549e4298f871661deae543f7afa5b21b2861444d (patch) | |
| tree | a1629316ca69edbc1a54577ae9153ab77b584a69 | |
| parent | e33215dfb71dbe1b0605f0429d9f2d9e9e3175cf (diff) | |
| parent | 145e8fa4a7fb498385257d546b2b67e314f69687 (diff) | |
Merge "Revert "Defer destroy activity if it is in transition."" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 86115990f746..004884925f02 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -3964,7 +3964,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } if (isCurrentVisible) { - if (isNextNotYetVisible || delayRemoval || isInTransition()) { + if (isNextNotYetVisible || delayRemoval) { // Add this activity to the list of stopping activities. It will be processed and // destroyed when the next activity reports idle. addToStopping(false /* scheduleIdle */, false /* idleDelayed */, |