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

Always remove starting window in performShow

Browse Source 
When going to homescreen and then opening apps quickly again, the
surface was not yet fully destroyed so we never triggered the
codepath to remove the starting window in that case, so it was
lingering around forever.

Test: Open app, press home, reopen app immidiately again, make sure
snapshot starting window is removed.
Bug: 31339431
Change-Id: I946e681e7dc222e3dedfd3edacb8f37aee4a198b
This commit is contained in:
Jorim Jaggi
2016-12-29 11:51:42 +01:00
parent 02886a82d8
commit a50da607da
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -3715,6 +3715,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
logPerformShow("performShow on ");
final int drawState = mWinAnimator.mDrawState;
if ((drawState == HAS_DRAWN || drawState == READY_TO_SHOW)
&& mAttrs.type != TYPE_APPLICATION_STARTING && mAppToken != null) {
mAppToken.onFirstWindowDrawn(this, mWinAnimator);
}
if (mWinAnimator.mDrawState != READY_TO_SHOW || !isReadyForDisplay()) {
return false;
}
@@ -3749,10 +3755,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
}
if (mAttrs.type != TYPE_APPLICATION_STARTING && mAppToken != null) {
mAppToken.onFirstWindowDrawn(this, mWinAnimator);
}
if (mAttrs.type == TYPE_INPUT_METHOD) {
getDisplayContent().mDividerControllerLocked.resetImeHideRequested();
}