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

Commit 04c6d73f authored by Justin Koh's avatar Justin Koh
Browse files

Revert "DO NOT MERGE Fix race condition between binder deaths" 

This reverts commit 8828d86e.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
parent 8828d86e

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

+0 −9
Original line number Diff line number Diff line
@@ -245,15 +245,6 @@ class AppWindowToken extends WindowToken { 
        return false;

    }



    void removeAllWindows() {

        for (int winNdx = allAppWindows.size() - 1; winNdx >= 0; --winNdx) {

            WindowState win = allAppWindows.get(winNdx);

            if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) Slog.w(WindowManagerService.TAG,

                    "removeAllWindows: removing win=" + win);

            win.mService.removeWindowLocked(win.mSession, win);

        }

    }



    @Override

    void dump(PrintWriter pw, String prefix) {

        super.dump(pw, prefix);

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class TaskStack { 
                final ArrayList<WindowState> windows = activities.get(activityNdx).allAppWindows;

                for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {

                    final WindowStateAnimator winAnimator = windows.get(winNdx).mWinAnimator;

                    if (winAnimator.isAnimating() || winAnimator.mWin.mExiting) {

                    if (winAnimator.isAnimating() && !winAnimator.isDummyAnimation()) {

                        return true;

                    }

                }

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

+1 −3
Original line number Diff line number Diff line
@@ -3540,7 +3540,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                return;

            }

            final Task oldTask = mTaskIdToTask.get(atoken.groupId);

            oldTask.removeAppToken(atoken);

            removeAppFromTaskLocked(atoken);



            atoken.groupId = groupId;

            Task newTask = mTaskIdToTask.get(groupId);
@@ -4562,8 +4562,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    }



    void removeAppFromTaskLocked(AppWindowToken wtoken) {

        wtoken.removeAllWindows();



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

        if (task != null) {

            if (!task.removeAppToken(wtoken)) {