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

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

Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev

parents 0f227c9a 6276cd4b

core/java/android/transition/Transition.java

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

                for (int i = numOldAnims - 1; i >= 0; 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);

                        anim.pause();

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

                for (int i = numOldAnims - 1; i >= 0; 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);

                        anim.resume();

                    }