diff options
| author | George Mount <mount@google.com> | 2014-07-24 14:24:44 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-07-25 13:59:37 +0000 |
| commit | 51c014843a6d339d115dfa88b9ee2fff90a8b844 (patch) | |
| tree | b29c25ee36aef09bbc2774c620274cec8208c996 /core/java | |
| parent | 13b8159e9037d431dd5159635aa409116fa42562 (diff) | |
| download | frameworks_base-51c014843a6d339d115dfa88b9ee2fff90a8b844.zip frameworks_base-51c014843a6d339d115dfa88b9ee2fff90a8b844.tar.gz frameworks_base-51c014843a6d339d115dfa88b9ee2fff90a8b844.tar.bz2 | |
Fix Monkey NPE.
Bug 16135577
Change-Id: If2ea474fd9ca9232fec325deed0e9b9b806595f6
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/transition/Transition.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index 1967213..53220d0 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -1623,12 +1623,14 @@ public abstract class Transition implements Cloneable { if (!mEnded) { ArrayMap<Animator, AnimationInfo> runningAnimators = getRunningAnimators(); int numOldAnims = runningAnimators.size(); - 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)) { - Animator anim = runningAnimators.keyAt(i); - anim.pause(); + if (sceneRoot != null) { + 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)) { + Animator anim = runningAnimators.keyAt(i); + anim.pause(); + } } } if (mListeners != null && mListeners.size() > 0) { |