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

Commit 19ae03e5 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Only defer remove starting window if the collecting target below task" into udc-qpr-dev

parents b650f99c de10f208

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

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

        if (mStartingData != null) {

            if (mStartingData.mWaitForSyncTransactionCommit

                    || mTransitionController.inCollectingTransition(startingWindow)) {

                    || mTransitionController.isCollecting(this)) {

                mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY;

                mStartingData.mPrepareRemoveAnimation = prepareAnimation;

                return;

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

+9 −0
Original line number Diff line number Diff line
@@ -108,4 +108,13 @@ public abstract class StartingData { 
    boolean hasImeSurface() {

        return false;

    }



    @Override

    public String toString() {

        return getClass().getSimpleName() + "{"

                + Integer.toHexString(System.identityHashCode(this))

                + " waitForSyncTransactionCommit=" + mWaitForSyncTransactionCommit

                + " removeAfterTransaction= " + mRemoveAfterTransaction

                + "}";

    }

}