Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev (05c2c22a) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,8 @@ public class ActivityManager {
		@IntDef({
		BUGREPORT_OPTION_FULL,
		BUGREPORT_OPTION_INTERACTIVE,
		BUGREPORT_OPTION_REMOTE
		BUGREPORT_OPTION_REMOTE,
		BUGREPORT_OPTION_WEAR
		})
		public @interface BugreportMode {}
		/**
		@@ -114,6 +115,11 @@ public class ActivityManager {
		* @hide
		*/
		public static final int BUGREPORT_OPTION_REMOTE = 2;
		/**
		* Takes a bugreport on a wearable device.
		* @hide
		*/
		public static final int BUGREPORT_OPTION_WEAR = 3;

		/**
		* <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code

+3 −0

Original line number	Diff line number	Diff line
		@@ -12042,6 +12042,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		case ActivityManager.BUGREPORT_OPTION_REMOTE:
		service = "bugreportremote";
		break;
		case ActivityManager.BUGREPORT_OPTION_WEAR:
		service = "bugreportwear";
		break;
		}
		if (service == null) {
		throw new IllegalArgumentException("Provided bugreport type is not correct, value: "