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

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

Merge "Do not start pending animation if another transition is collecting." into main

parents a2cbecbb e1eb9af2
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,12 @@ class BackNavigationController {
            return;
        }

        if (mWindowManagerService.mRoot.mTransitionController.isCollecting()) {
            Slog.v(TAG, "Skip predictive back transition, another transition is collecting");
            cancelPendingAnimation();
            return;
        }

        // Ensure the final animation targets which hidden by transition could be visible.
        for (int i = 0; i < targets.size(); i++) {
            final WindowContainer wc = targets.get(i).mContainer;
@@ -1066,6 +1072,7 @@ class BackNavigationController {
            Slog.e(TAG, "Remote animation gone", e);
        }
        mPendingAnimationBuilder = null;
        mNavigationMonitor.stopMonitorTransition();
    }

    /**