am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev

* commit '95d520f160db65f90da56610eee1a047fb60fc4e': Fix NPE in moveSharedElementsToOverlay
2014-10-28 17:04:33 +00:00
parent 69a3dd85df 95d520f160
commit 8a536bb4e0
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/ActivityTransitionCoordinator.java
+++ b/core/java/android/app/ActivityTransitionCoordinator.java
@@ -798,7 +798,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
    }

    protected void moveSharedElementsToOverlay() {
-        if (!mWindow.getSharedElementsUseOverlay()) {
+        if (mWindow == null || !mWindow.getSharedElementsUseOverlay()) {
            return;
        }
        setSharedElementMatrices();