Merge "[WindowManagerService] fix starting window issue"

am: 8683f1b160

* commit '8683f1b160c10184aa15cec1b8ef776e2ce8fa9a':
  [WindowManagerService] fix starting window issue
This commit is contained in:
Wale Ogunwale
2016-01-06 15:55:02 +00:00
committed by android-build-merger

View File

@@ -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;