Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a81cea authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge branch 'master' of... 

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

services/core/java/com/android/server/wm/WindowSurfacePlacer.java

+6 −1
Original line number Diff line number Diff line
@@ -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) {