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

Commit 5a7cf3ee authored by Chet Haase's avatar Chet Haase
Browse files

Fix TransitionManager.go() to allow null transitions 

The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
parent d06cd2b1

core/java/android/transition/TransitionManager.java

+7 −3
Original line number Diff line number Diff line
@@ -182,11 +182,15 @@ public class TransitionManager { 


        final ViewGroup sceneRoot = scene.getSceneRoot();



        Transition transitionClone = transition.clone();

        Transition transitionClone = null;

        if (transition != null) {

            transitionClone = transition.clone();

            transitionClone.setSceneRoot(sceneRoot);

        }



        Scene oldScene = Scene.getCurrentScene(sceneRoot);

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

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

                oldScene.isCreatedFromLayoutResource()) {

            transitionClone.setCanRemoveViews(true);

        }