commit bc98c55db4187021862d8fdeb332cbcd25e4749b
author Wale Ogunwale <ogunwale@google.com> Wed Jan 06 22:02:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 06 22:02:24 2016 +0000
tree 547d2c3b2bfcdf04fc431c05d1ff5bd63f253d2d
parent 904bfb5fc4c2c5a4f427c8ab956c0286e56a0941
parent abc218009071244c211936bc91c96ed26220bc0d

Merge "[WindowManagerService] fix starting window issue"

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 213f14b..f6e62f6 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3888,7 +3888,7 @@
             return false;
         }
         WindowState startingWindow = ttoken.startingWindow;
-        if (startingWindow != null) {
+        if (startingWindow != null && ttoken.startingView != null) {
             // In this case, the starting icon has already been displayed, so start
             // letting windows get shown immediately without any more transitions.
             mSkipAppTransitionAnimation = true;