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

Commit 1ef5980c authored by Winson Chung's avatar Winson Chung
Browse files

Revert "Add shell command to reset the frozen task state" 

Revert submission 24866277-recents_freeze_tests

Reason for revert: b/302267317

Reverted changes: /q/submissionid:24866277-recents_freeze_tests

Change-Id: Ia13dadc0d217539ab2cbfb8a235ae8503942def8
parent 509ddd83

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

+0 −11
Original line number Diff line number Diff line
@@ -9646,15 +9646,4 @@ public class WindowManagerService extends IWindowManager.Stub 
            Binder.restoreCallingIdentity(origId);

        }

    }



    /**

     * Resets the spatial ordering of recents for testing purposes.

     */

    void resetFreezeRecentTaskListReordering() {

        if (!checkCallingPermission(MANAGE_ACTIVITY_TASKS,

                "resetFreezeRecentTaskListReordering()")) {

            throw new SecurityException("Requires MANAGE_ACTIVITY_TASKS permission");

        }

        mAtmService.getRecentTasks().resetFreezeTaskListReorderingOnTimeout();

    }

}

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

+0 −9
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ public class WindowManagerShellCommand extends ShellCommand { 
                    return runReset(pw);

                case "disable-blur":

                    return runSetBlurDisabled(pw);

                case "reset-freeze-recent-tasks":

                    return runResetFreezeRecentTaskListReordering(pw);

                case "shell":

                    return runWmShellCommand(pw);

                default:
@@ -254,11 +252,6 @@ public class WindowManagerShellCommand extends ShellCommand { 
        return 0;

    }



    private int runResetFreezeRecentTaskListReordering(PrintWriter pw) throws RemoteException {

        mInternal.resetFreezeRecentTaskListReordering();

        return 0;

    }



    private void printInitialDisplayDensity(PrintWriter pw , int displayId) {

        try {

            final int initialDensity = mInterface.getInitialDisplayDensity(displayId);
@@ -1499,8 +1492,6 @@ public class WindowManagerShellCommand extends ShellCommand { 
        printLetterboxHelp(pw);

        printMultiWindowConfigHelp(pw);



        pw.println("  reset-freeze-recent-tasks");

        pw.println("    Resets the spatial ordering of the recent tasks list");

        pw.println("  reset [-d DISPLAY_ID]");

        pw.println("    Reset all override settings.");

        if (!IS_USER) {