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

Commit 106bf46f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Fixed leak of app token in exiting list." into oc-dev 

am: 781ad9f2

Change-Id: I0ce62bb39852d2107a84f6d3bc290b7dd4115456
parents 8f3258ac 781ad9f2

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

+3 −0
Original line number Diff line number Diff line
@@ -560,6 +560,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
            // with it will be removed as soon as their animations are complete

            mAppAnimator.clearAnimation();

            mAppAnimator.animating = false;

            if (stack != null) {

                stack.mExitingAppTokens.remove(this);

            }

            removeIfPossible();

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -1685,6 +1685,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                // re-factor.

                atoken.firstWindowDrawn = false;

                atoken.clearAllDrawn();

                final TaskStack stack = atoken.getStack();

                if (stack != null) {

                    stack.mExitingAppTokens.remove(atoken);

                }

            }

        }