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

Commit b67b8a6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE during Activity transition using wrong Activity."

parents 4d085560 3289bfa2

core/java/android/app/ActivityTransitionState.java

+3 −2
Original line number Diff line number Diff line
@@ -337,11 +337,12 @@ class ActivityTransitionState { 
    }



    public void startExitOutTransition(Activity activity, Bundle options) {

        if (!activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)) {

        mEnterTransitionCoordinator = null;

        if (!activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS) ||

                mExitTransitionCoordinators == null) {

            return;

        }

        ActivityOptions activityOptions = new ActivityOptions(options);

        mEnterTransitionCoordinator = null;

        if (activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {

            int key = activityOptions.getExitCoordinatorKey();

            int index = mExitTransitionCoordinators.indexOfKey(key);