Merge "Revert^2 "Add shell command to reset the frozen task state"" into main (477d8208) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -10233,6 +10233,17 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}

		/**
		* Resets the spatial ordering of recents for testing purposes.
		*/
		void resetFreezeRecentTaskListReordering() {
		if (!checkCallingPermission(permission.MANAGE_ACTIVITY_TASKS,
		"resetFreezeRecentTaskListReordering()")) {
		throw new SecurityException("Requires MANAGE_ACTIVITY_TASKS permission");
		}
		mAtmService.getRecentTasks().resetFreezeTaskListReorderingOnTimeout();
		}

		@Override
		public void registerTrustedPresentationListener(IBinder window,
		ITrustedPresentationListener listener,

+9 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,8 @@ public class WindowManagerShellCommand extends ShellCommand {
		return runReset(pw);
		case "disable-blur":
		return runSetBlurDisabled(pw);
		case "reset-freeze-recent-tasks":
		return runResetFreezeRecentTaskListReordering(pw);
		case "set-display-windowing-mode":
		return runSetDisplayWindowingMode(pw);
		case "get-display-windowing-mode":
		@@ -275,6 +277,11 @@ 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);
		@@ -1592,6 +1599,8 @@ 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(" set-display-windowing-mode [-d DISPLAY_ID] [mode_id]");
		pw.println(" As mode_id, use " + WINDOWING_MODE_UNDEFINED + " for undefined, "
		+ WINDOWING_MODE_FREEFORM + " for freeform, " + WINDOWING_MODE_FULLSCREEN + " for"