Merge "Removed --verbose from `dumpsys activity`." into udc-dev (520219ec) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -9866,7 +9866,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		boolean dumpNormalPriority = false;
		boolean dumpVisibleStacksOnly = false;
		boolean dumpFocusedStackOnly = false;
		boolean dumpVerbose = false;
		int dumpDisplayId = INVALID_DISPLAY;
		String dumpPackage = null;
		int dumpUserId = UserHandle.USER_ALL;
		@@ -9925,8 +9924,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		return;
		}
		dumpClient = true;
		} else if ("--verbose".equals(opt)) {
		dumpVerbose = true;
		} else if ("-h".equals(opt)) {
		ActivityManagerShellCommand.dumpHelp(pw, true);
		return;
		@@ -10213,8 +10210,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		} else {
		// Dumping a single activity?
		if (!mAtmInternal.dumpActivity(fd, pw, cmd, args, opti, dumpAll,
		dumpVisibleStacksOnly, dumpFocusedStackOnly, dumpVerbose, dumpDisplayId,
		dumpUserId)) {
		dumpVisibleStacksOnly, dumpFocusedStackOnly, dumpDisplayId, dumpUserId)) {
		ActivityManagerShellCommand shell = new ActivityManagerShellCommand(this, true);
		int res = shell.exec(this, null, fd, null, args, null,
		new ResultReceiver(null));

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -3957,7 +3957,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
		pw.println(" --checkin: output checkin format, resetting data.");
		pw.println(" --C: output checkin format, not resetting data.");
		pw.println(" --proto: output dump in protocol buffer format.");
		pw.println(" --verbose: dumps extra information.");
		pw.printf(" %s: dump just the DUMPABLE-related state of an activity. Use the %s "
		+ "option to list the supported DUMPABLEs\n", Activity.DUMP_ARG_DUMP_DUMPABLE,
		Activity.DUMP_ARG_LIST_DUMPABLES);

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -490,8 +490,7 @@ public abstract class ActivityTaskManagerInternal {
		/** Dump the current activities state. */
		public abstract boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name,
		String[] args, int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly,
		boolean dumpFocusedRootTaskOnly, boolean dumpVerbose, int displayIdFilter,
		@UserIdInt int userId);
		boolean dumpFocusedRootTaskOnly, int displayIdFilter, @UserIdInt int userId);

		/** Dump the current state for inclusion in oom dump. */
		public abstract void dumpForOom(PrintWriter pw);

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

+10 −16

Original line number	Diff line number	Diff line
		@@ -4205,8 +4205,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		*/
		protected boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args,
		int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly,
		boolean dumpFocusedRootTaskOnly, boolean dumpVerbose, int displayIdFilter,
		@UserIdInt int userId) {
		boolean dumpFocusedRootTaskOnly, int displayIdFilter, @UserIdInt int userId) {
		ArrayList<ActivityRecord> activities;

		synchronized (mGlobalLock) {
		@@ -4251,7 +4250,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}
		}
		}
		dumpActivity(" ", fd, pw, activities.get(i), newArgs, dumpAll, dumpVerbose);
		dumpActivity(" ", fd, pw, activities.get(i), newArgs, dumpAll);
		}
		if (!printedAnything) {
		// Typically happpens when no task matches displayIdFilter
		@@ -4265,7 +4264,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		* there is a thread associated with the activity.
		*/
		private void dumpActivity(String prefix, FileDescriptor fd, PrintWriter pw,
		ActivityRecord r, String[] args, boolean dumpAll, boolean dumpVerbose) {
		ActivityRecord r, String[] args, boolean dumpAll) {
		String innerPrefix = prefix + " ";
		IApplicationThread appThread = null;
		synchronized (mGlobalLock) {
		@@ -4281,15 +4280,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		} else {
		pw.print("(not running)");
		}
		if (dumpVerbose) {
		pw.print(" userId=");
		pw.print(r.mUserId);
		pw.print(" uid=");
		pw.print(r.getUid());
		printDisplayInfoAndNewLine(pw, r);
		} else {
		pw.println();
		}
		if (dumpAll) {
		r.dump(pw, innerPrefix, /* dumpAll= */ true);
		}
		@@ -6618,11 +6613,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		@Override
		public boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name,
		String[] args, int opti, boolean dumpAll, boolean dumpVisibleRootTasksOnly,
		boolean dumpFocusedRootTaskOnly, boolean dumpVerbose, int displayIdFilter,
		boolean dumpFocusedRootTaskOnly, int displayIdFilter,
		@UserIdInt int userId) {
		return ActivityTaskManagerService.this.dumpActivity(fd, pw, name, args, opti, dumpAll,
		dumpVisibleRootTasksOnly, dumpFocusedRootTaskOnly, dumpVerbose, displayIdFilter,
		userId);
		dumpVisibleRootTasksOnly, dumpFocusedRootTaskOnly, displayIdFilter, userId);
		}

		@Override