diff options
3 files changed, 2 insertions, 25 deletions
diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java index 442269ab4015..10405ec7cd88 100644 --- a/services/core/java/com/android/server/wm/RecentTasks.java +++ b/services/core/java/com/android/server/wm/RecentTasks.java @@ -302,12 +302,9 @@ class RecentTasks { } // Always update the reordering time when this is called to ensure that the timeout - // is reset. Extend this duration when running in tests. - final long timeout = ActivityManager.isRunningInUserTestHarness() - ? mFreezeTaskListTimeoutMs * 10 - : mFreezeTaskListTimeoutMs; + // is reset mService.mH.removeCallbacks(mResetFreezeTaskListOnTimeoutRunnable); - mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, timeout); + mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, mFreezeTaskListTimeoutMs); } /** diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 3faf8b9ff8a8..3db7765963f7 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 fa9a65fda853..8fad9509af44 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) { |