Merge "[WindowManagerService] fix starting window issue"

2016-01-06 15:47:05 +00:00
parent 2786002bd5 a8d54b243b
commit 8683f1b160
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
@@ -4312,7 +4312,7 @@ public class WindowManagerService extends IWindowManager.Stub
                AppWindowToken ttoken = findAppWindowToken(transferFrom);
                if (ttoken != null) {
                    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;