From eca1ae5e442bf5f13617ab823343730619512632 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 27 Oct 2014 14:25:12 -0700
Subject: [PATCH] Fix NPE in moveSharedElementsToOverlay

Bug 18119532

Change-Id: I334bda2d63427032583a15a483e000412024c150
---
 core/java/android/app/ActivityTransitionCoordinator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java
index d611058720612..75982f5c5118c 100644
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -711,7 +711,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
     }
 
     protected void moveSharedElementsToOverlay() {
-        if (!mWindow.getSharedElementsUseOverlay()) {
+        if (mWindow == null || !mWindow.getSharedElementsUseOverlay()) {
             return;
         }
         int numSharedElements = mSharedElements.size();