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

Merge "Add the app back to mOpeningApps if transition is unset but ready." into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-05 19:40:35 +00:00
committed by Android (Google) Code Review
parent fdb3073a28 81a1c176ba
commit c0b8c119d3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4292,9 +4292,13 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.appDied = false;
wtoken.removeAllWindows();
} else if (visible) {
mOpeningApps.add(wtoken);
if (!mAppTransition.isTransitionSet() && mAppTransition.isReady()) {
// Add the app mOpeningApps if transition is unset but ready. This means
// we're doing a screen freeze, and the unfreeze will wait for all opening
// apps to be ready.
mOpeningApps.add(wtoken);
}
wtoken.startingMoved = false;
// If the token is currently hidden (should be the common case), or has been
// stopped, then we need to set up to wait for its windows to be ready.
if (wtoken.hidden || wtoken.mAppStopped) {
@@ -4338,6 +4342,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
wtoken.inPendingTransaction = true;
if (visible) {
mOpeningApps.add(wtoken);
wtoken.mEnteringAnimation = true;
} else {
mClosingApps.add(wtoken);