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

Commit 7b749964 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 

* commit '2d53188b2ed3950f4d1c7e5163ba181c83ea5c85':
  Fix NPE when transitioning on unattached scene root.
parents c07292aa 46a761db

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

                    }

                    }