Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[WindowManagerService] fix starting window issue"

Browse Source 
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
parent a35d617cce 8683f1b160
commit a7582b55e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4312,7 +4312,7 @@ public class WindowManagerService extends IWindowManager.Stub
AppWindowToken ttoken = findAppWindowToken(transferFrom); AppWindowToken ttoken = findAppWindowToken(transferFrom);
if (ttoken != null) { if (ttoken != null) {
WindowState startingWindow = ttoken.startingWindow; 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 // In this case, the starting icon has already been displayed, so start
// letting windows get shown immediately without any more transitions. // letting windows get shown immediately without any more transitions.
mSkipAppTransitionAnimation = true; mSkipAppTransitionAnimation = true;