diff options
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 5 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index c460b048a3b7..618a7ed34708 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -148,7 +148,7 @@ public class Am extends BaseCommand { " am clear-debug-app\n" + " am set-watch-heap <PROCESS> <MEM-LIMIT>\n" + " am clear-watch-heap\n" + - " am bug-report [--progress]\n" + + " am bug-report [--progress | --telephony]\n" + " am monitor [--gdb <port>]\n" + " am hang [--allow-restart]\n" + " am restart\n" + @@ -274,6 +274,7 @@ public class Am extends BaseCommand { "am bug-report: request bug report generation; will launch a notification\n" + " when done to select where it should be delivered. Options are: \n" + " --progress: will launch a notification right away to show its progress.\n" + + " --telephony: will dump only telephony sections.\n" + "\n" + "am monitor: start monitoring for crashes or ANRs.\n" + " --gdb: start gdbserv on the given port at crash/ANR\n" + @@ -1151,6 +1152,8 @@ public class Am extends BaseCommand { while ((opt=nextOption()) != null) { if (opt.equals("--progress")) { bugreportType = ActivityManager.BUGREPORT_OPTION_INTERACTIVE; + } else if (opt.equals("--telephony")) { + bugreportType = ActivityManager.BUGREPORT_OPTION_TELEPHONY; } else { System.err.println("Error: Unknown option: " + opt); return; diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 0440be6dbd40..5b6493688ba4 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -126,7 +126,8 @@ public class ActivityManager { BUGREPORT_OPTION_FULL, BUGREPORT_OPTION_INTERACTIVE, BUGREPORT_OPTION_REMOTE, - BUGREPORT_OPTION_WEAR + BUGREPORT_OPTION_WEAR, + BUGREPORT_OPTION_TELEPHONY }) public @interface BugreportMode {} /** @@ -154,6 +155,13 @@ public class ActivityManager { public static final int BUGREPORT_OPTION_WEAR = 3; /** + * Takes a lightweight version of bugreport that only includes a few, urgent sections + * used to report telephony bugs. + * @hide + */ + public static final int BUGREPORT_OPTION_TELEPHONY = 4; + + /** * <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code * <meta-data>}</a> name for a 'home' Activity that declares a package that is to be * uninstalled in lieu of the declaring one. The package named here must be diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b68af438bf18..eb8063134620 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12172,6 +12172,9 @@ public final class ActivityManagerService extends ActivityManagerNative case ActivityManager.BUGREPORT_OPTION_WEAR: service = "bugreportwear"; break; + case ActivityManager.BUGREPORT_OPTION_TELEPHONY: + service = "bugreportelefony"; + break; } if (service == null) { throw new IllegalArgumentException("Provided bugreport type is not correct, value: " |