commit 2418d7381f1a1c15b26af252d7d08745c1858af4
author George Mount <mount@google.com> Fri Sep 12 14:09:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 12 14:09:23 2014 +0000
tree eb64b34a84b60006f050466cdf305fcf54fba4c3
parent 135ce76a26b94e6725c48abd87806946b0d4bc81
parent 4188d0de101e2d932130f15f1d11d8a83326c22f

Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev

core/java/android/app/EnterTransitionCoordinator.java

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 922561d..9ca150d 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -329,7 +329,10 @@
                 @Override
                 public void run() {
                     if (mAnimations++ < MIN_ANIMATION_FRAMES) {
-                        getDecor().postOnAnimation(this);
+                        View decorView = getDecor();
+                        if (decorView != null) {
+                            decorView.postOnAnimation(this);
+                        }
                     } else if (mResultReceiver != null) {
                         mResultReceiver.send(MSG_HIDE_SHARED_ELEMENTS, null);
                         mResultReceiver = null; // all done sending messages.