Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79b62e55 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by wilsonshih
Browse files

Revert^2 "Defer destroy activity if it is in transition." 

This reverts commit 145e8fa4.

Reason for revert: Original CL need to consider if the finish activity
is the last activity in the display, there is no close display
transition right now.

Test: atest CarActivityManagerTest
Bug: 343671768
Bug: 318877215
Bug: 323129567
Change-Id: Ia405ec2d8229f2ff7668be5361eb48f9c5793f2e
parent 85ae83ec

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3964,7 +3964,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        }

















        if (isCurrentVisible) {







        if (isCurrentVisible) {











            if (isNextNotYetVisible || delayRemoval) {







            if (isNextNotYetVisible || delayRemoval || (next != null && isInTransition())) {











                // Add this activity to the list of stopping activities. It will be processed and







                // Add this activity to the list of stopping activities. It will be processed and











                // destroyed when the next activity reports idle.







                // destroyed when the next activity reports idle.











                addToStopping(false /* scheduleIdle */, false /* idleDelayed */,







                addToStopping(false /* scheduleIdle */, false /* idleDelayed */,