From 6276cd4b8defba1b6fef47ebc1bbe14498655b94 Mon Sep 17 00:00:00 2001 From: George Mount Date: Thu, 28 Aug 2014 16:17:38 -0700 Subject: [PATCH] Fix NPE when transitioning on unattached scene root. Bug 17261558 Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be --- core/java/android/transition/Transition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index 59ba71fa8208c..bd52e714a025d 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -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(); }