diff options
4 files changed, 12 insertions, 24 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f748d85bc6d6..8ab54ae1bbb6 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -9878,7 +9878,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; @@ -9937,8 +9936,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; @@ -10225,8 +10222,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)); diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index b9a0e84b1d92..c7f27454ae8f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -3947,7 +3947,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); diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java index 5ea28542207e..bfb735de2d0a 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java @@ -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); diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index ee2ac4d6c4c5..c7a8663bee58 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -4214,8 +4214,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) { @@ -4260,7 +4259,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 @@ -4274,7 +4273,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) { @@ -4290,15 +4289,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(); - } + pw.print(" userId="); + pw.print(r.mUserId); + pw.print(" uid="); + pw.print(r.getUid()); + printDisplayInfoAndNewLine(pw, r); if (dumpAll) { r.dump(pw, innerPrefix, /* dumpAll= */ true); } @@ -6627,11 +6622,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 |