Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev (2729bb85) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;

+9 −1

Original line number	Diff line number	Diff line
		@@ -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 {}
		/**
		@@ -153,6 +154,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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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: "