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

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

Merge "Fix crash when setting no_animation flag on a not collected activity" into main

parents 00a77e3c 9fb937e3
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -4736,6 +4736,9 @@ final class ActivityRecord extends WindowToken {
            if (!myBounds.equals(nextBounds)) {
                // Mark as no animation, so these changes won't merge into playing transition.
                if (mTransitionController.inPlayingTransition(this)) {
                    // This handles the case where the top activity becomes invisible, so the next
                    // activity may not have been collected yet.
                    mTransitionController.collect(next);
                    mTransitionController.setNoAnimation(next);
                    mTransitionController.setNoAnimation(this);
                }