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

Commit 6276cd4b authored by George Mount's avatar George Mount
Browse files

Fix NPE when transitioning on unattached scene root. 

Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
parent c9991c71

core/java/android/transition/Transition.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1656,7 +1656,7 @@ public abstract class Transition implements Cloneable { 
                WindowId windowId = sceneRoot.getWindowId();

                WindowId windowId = sceneRoot.getWindowId();

                for (int i = numOldAnims - 1; i >= 0; i--) {

                for (int i = numOldAnims - 1; i >= 0; i--) {

                    AnimationInfo info = runningAnimators.valueAt(i);

                    AnimationInfo info = runningAnimators.valueAt(i);

                    if (info.view != null && windowId.equals(info.windowId)) {

                    if (info.view != null && windowId != null && windowId.equals(info.windowId)) {

                        Animator anim = runningAnimators.keyAt(i);

                        Animator anim = runningAnimators.keyAt(i);

                        anim.pause();

                        anim.pause();

                    }

                    }
@@ -1689,7 +1689,7 @@ public abstract class Transition implements Cloneable { 
                WindowId windowId = sceneRoot.getWindowId();

                WindowId windowId = sceneRoot.getWindowId();

                for (int i = numOldAnims - 1; i >= 0; i--) {

                for (int i = numOldAnims - 1; i >= 0; i--) {

                    AnimationInfo info = runningAnimators.valueAt(i);

                    AnimationInfo info = runningAnimators.valueAt(i);

                    if (info.view != null && windowId.equals(info.windowId)) {

                    if (info.view != null && windowId != null && windowId.equals(info.windowId)) {

                        Animator anim = runningAnimators.keyAt(i);

                        Animator anim = runningAnimators.keyAt(i);

                        anim.resume();

                        anim.resume();

                    }

                    }