From 4188d0de101e2d932130f15f1d11d8a83326c22f Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 11 Sep 2014 17:47:11 -0700
Subject: [PATCH] Fixed NPE in EnterTransitionCoordinator

Bug 17478213

Change-Id: I6614f6e9e91103fbf50c49d2560088969f90685a
---
 core/java/android/app/EnterTransitionCoordinator.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 922561d6a8bc0..9ca150d02c732 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -329,7 +329,10 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
                 @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.