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

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

Fix TransitionManager.go with null Transition. 

Bug: 31529500

Test: I8e5a3285bc5e2b34a1eb32afd67e3184c6d8897e
Change-Id: Ibf273d5acab4e32420093adc395034b2246bd530
parent 1690bd65

core/java/android/transition/TransitionManager.java

+13 −13
Original line number Diff line number Diff line
@@ -185,17 +185,16 @@ public class TransitionManager { 


        final ViewGroup sceneRoot = scene.getSceneRoot();

        if (!sPendingTransitions.contains(sceneRoot)) {

            if (transition == null) {

                scene.enter();

            } else {

                sPendingTransitions.add(sceneRoot);



            Transition transitionClone = null;

            if (transition != null) {

                transitionClone = transition.clone();

                Transition transitionClone = transition.clone();

                transitionClone.setSceneRoot(sceneRoot);

            }



                Scene oldScene = Scene.getCurrentScene(sceneRoot);

            if (oldScene != null && transitionClone != null &&

                    oldScene.isCreatedFromLayoutResource()) {

                if (oldScene != null && oldScene.isCreatedFromLayoutResource()) {

                    transitionClone.setCanRemoveViews(true);

                }
@@ -206,6 +205,7 @@ public class TransitionManager { 
                sceneChangeRunTransition(sceneRoot, transitionClone);

            }

        }

    }



    private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() {

        WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions =