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

Commit 2613fb54 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev

parents 47c7a8c1 a3edbf6a

core/java/android/app/ActivityTransitionState.java

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

    }





    public void startExitOutTransition(Activity activity, Bundle options) {

    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;

            return;

        }

        }

        ActivityOptions activityOptions = new ActivityOptions(options);

        ActivityOptions activityOptions = new ActivityOptions(options);

        mEnterTransitionCoordinator = null;

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

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

            int key = activityOptions.getExitCoordinatorKey();

            int key = activityOptions.getExitCoordinatorKey();

            int index = mExitTransitionCoordinators.indexOfKey(key);

            int index = mExitTransitionCoordinators.indexOfKey(key);