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

Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-29 00:09:25 +00:00
committed by Android (Google) Code Review
parent 176f2533a1 5d23afa9e5
commit eb36d83901
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -937,8 +937,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
// Update keyguard flags upon finishing relaunch. // Update keyguard flags upon finishing relaunch.
checkKeyguardFlagsChanged(); checkKeyguardFlagsChanged();
} }
updateAllDrawn();
} }
void clearRelaunching() { void clearRelaunching() {
@@ -1344,6 +1342,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
} }
} }
/**
* Determines if the token has finished drawing. This should only be called from
* {@link DisplayContent#applySurfaceChangesTransaction}
*/
void updateAllDrawn() { void updateAllDrawn() {
if (!allDrawn) { if (!allDrawn) {
// Number of drawn windows can be less when a window is being relaunched, wait for // Number of drawn windows can be less when a window is being relaunched, wait for