Merge "[WindowManagerService] fix starting window issue"

2016-01-06 22:02:24 +00:00
parent 904bfb5fc4 abc2180090
commit bc98c55db4
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3888,7 +3888,7 @@ public class WindowManagerService extends IWindowManager.Stub
            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;