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

Commit 0c4d81cf authored by Craig Mautner's avatar Craig Mautner
Browse files

Do not defer removal for empty tasks or activities 

It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
parent d5ff63ba

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

+8 −3
Original line number Diff line number Diff line
@@ -4810,7 +4810,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (DEBUG_ADD_REMOVE || DEBUG_TOKEN_MOVEMENT) Slog.v(TAG, "removeAppToken: "

                        + wtoken + " delayed=" + delayed + " Callers=" + Debug.getCallers(4));

                final TaskStack stack = mTaskIdToTask.get(wtoken.groupId).mStack;

                if (delayed) {

                if (delayed && !wtoken.allAppWindows.isEmpty()) {

                    // set the token aside because it has an active animation to be finished

                    if (DEBUG_ADD_REMOVE || DEBUG_TOKEN_MOVEMENT) Slog.v(TAG,

                            "removeAppToken make exiting: " + wtoken);
@@ -5194,7 +5194,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    void removeTaskLocked(Task task) {

        final int taskId = task.taskId;

        final TaskStack stack = task.mStack;

        if (stack.isAnimating()) {

        if (!task.mAppTokens.isEmpty() && stack.isAnimating()) {

            if (DEBUG_STACK) Slog.i(TAG, "removeTask: deferring removing taskId=" + taskId);

            task.mDeferRemoval = true;

            return;
@@ -10041,7 +10041,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                    mStackIdToStack.valueAt(stackNdx).mExitingAppTokens;

            for (i = exitingAppTokens.size() - 1; i >= 0; i--) {

                AppWindowToken token = exitingAppTokens.get(i);

                if (!token.hasVisible && !mClosingApps.contains(token) && !token.mDeferRemoval) {

                if (!token.hasVisible && !mClosingApps.contains(token) &&

                        (!token.mDeferRemoval || token.allAppWindows.isEmpty())) {

                    // Make sure there is no animation running on this token,

                    // so any windows associated with it will be removed as

                    // soon as their animations are complete
@@ -10051,6 +10052,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                            "performLayout: App token exiting now removed" + token);

                    removeAppFromTaskLocked(token);

                    exitingAppTokens.remove(i);

                    final Task task = mTaskIdToTask.get(token.groupId);

                    if (task != null && task.mDeferRemoval && task.mAppTokens.isEmpty()) {

                        removeTaskLocked(task);

                    }

                }

            }

        }