From 1ef5980c81baef2b11b7e69cab2708b569df41c4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 29 Sep 2023 17:35:54 +0000
Subject: [PATCH] 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
---
.../com/android/server/wm/WindowManagerService.java | 11 -----------
.../android/server/wm/WindowManagerShellCommand.java | 9 ---------
2 files changed, 20 deletions(-)
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 3faf8b9ff8a80..3db7765963f78 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -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();
- }
}
diff --git a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
index fa9a65fda8537..8fad9509af445 100644
--- a/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
+++ b/services/core/java/com/android/server/wm/WindowManagerShellCommand.java
@@ -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) {
--
GitLab