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

Commit 4bcca649 authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Avoid starting window being stuck while launch transient launch. 

While entering transient launch transition, the transient hide task and
it's descendant won't be add to sync group, so if an Activity request
finish itself during collect transient launch, the starting window can
be stuck to next activity because the close activity transition will be
collect within the same transition.
So while able to remove starting window, checking the sync state of the
activity instead of isCollecting.

Flag: EXEMPT bugfix
Bug: 365040473
Test: atest ActivityRecordTests
Test: simulate with sample app by following the description on issue.
Change-Id: I444802c434a3522a07fcb4d647a8a8008b441018
parent 9f8f7252

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

+1 −1
Original line number Diff line number Diff line
@@ -2849,7 +2849,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        final boolean hasImeSurface;

        if (mStartingData != null) {

            if (mStartingData.mWaitForSyncTransactionCommit

                    || mTransitionController.isCollecting(this)) {

                    || mSyncState != SYNC_STATE_NONE) {

                mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY;

                mStartingData.mPrepareRemoveAnimation = prepareAnimation;

                return;