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

Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base

Browse Source
This commit is contained in:
Amit Mahajan
2016-01-20 19:21:23 +00:00
committed by android-build-merger
parent 42051806ea cd709833f8
commit 70a81cea2b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -1197,7 +1197,12 @@ class WindowSurfacePlacer {
// if app window is removed, or window relayout to invisible. We don't want to
// clear it out for windows that get replaced, because the animation depends on
// the flag to remove the replaced window.
if (!win.mWillReplaceWindow) {
//
// We also don't clear the mExiting flag for windows which have the
// mRemoveOnExit flag. This indicates an explicit remove request has been issued
// by the client. We should let animation proceed and not clear this flag or
// they won't eventually be removed by WindowStateAnimator#finishExit.
if (!win.mWillReplaceWindow && !win.mRemoveOnExit) {
win.mExiting = false;
}
if (win.mWinAnimator.mAnimLayer > layer) {