Fix NPE in EnterTransitionCoordinator.

Bug 17324730

Change-Id: I2a8c5a4b82a7a252d4ac2319a26f3610b8e358ac

1 files changed, 6 insertions, 4 deletions

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 5a6898d08161..47d3fd60c586 100644
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -194,10 +194,12 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
                         @Override
                         public boolean onPreDraw() {
                             getDecor().getViewTreeObserver().removeOnPreDrawListener(this);
-                            Bundle state = captureSharedElementState();
-                            setSharedElementMatrices();
-                            moveSharedElementsToOverlay();
-                            mResultReceiver.send(MSG_SHARED_ELEMENT_DESTINATION, state);
+                            if (mResultReceiver != null) {
+                                Bundle state = captureSharedElementState();
+                                setSharedElementMatrices();
+                                moveSharedElementsToOverlay();
+                                mResultReceiver.send(MSG_SHARED_ELEMENT_DESTINATION, state);
+                            }
                             return true;
                         }
                     });