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

Commit a3edbf6a authored by George Mount's avatar George Mount
Browse files

Fix NPE during Activity transition using wrong Activity. 

Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit 3289bfa2)
parent e24a4590

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);