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

Commit 391286a6 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Dispatch transition cancelled callback at the end of abort"

parents bee3ff15 a553340b

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

+2 −0
Original line number Diff line number Diff line
@@ -6441,6 +6441,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 


        @Override

        public void onAppTransitionCancelledLocked(boolean keyguardGoingAway) {

            // It is only needed when freezing display in legacy transition.

            if (mTransitionController.isShellTransitionsEnabled()) return;

            continueUpdateOrientationForDiffOrienLaunchingApp();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -550,10 +550,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            throw new IllegalStateException("Too late to abort.");

        }

        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Aborting Transition: %d", mSyncId);

        mController.dispatchLegacyAppTransitionCancelled();

        mState = STATE_ABORT;

        // Syncengine abort will call through to onTransactionReady()

        mSyncEngine.abort(mSyncId);

        mController.dispatchLegacyAppTransitionCancelled();

    }



    void setRemoteTransition(RemoteTransition remoteTransition) {