Fix NPE in moveSharedElementsToOverlay

Bug 18119532 Change-Id: I334bda2d63427032583a15a483e000412024c150
2014-10-27 14:25:12 -07:00
parent 104d2484ec
commit eca1ae5e44
1 changed files with 1 additions and 1 deletions
--- 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();