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

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

Merge "[Back Navi] Fix a recursive call from clearBackAnimations to isTarget." into main

parents 80c67351 af692457

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

+4 −6
Original line number Diff line number Diff line
@@ -1099,10 +1099,6 @@ class BackNavigationController { 
        }



        void finishPresentAnimations() {

            if (!mComposed) {

                return;

            }



            if (mCloseAdaptor != null) {

                mCloseAdaptor.mTarget.cancelAnimation();

                mCloseAdaptor = null;
@@ -1131,8 +1127,10 @@ class BackNavigationController { 
        }



        void clearBackAnimateTarget() {

            finishPresentAnimations();

            if (mComposed) {

                mComposed = false;

                finishPresentAnimations();

            }

            mWaitTransition = false;

            mStartingSurfaceTargetMatch = false;

            mSwitchType = UNKNOWN;