From 967fc8dd62be9d29f89e3520ec79d4873df03481 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 8 Jul 2016 11:44:20 -0700 Subject: [PATCH] Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting. b/30041885 Change-Id: I4ffa7b5c8ddad35e32f0f31ce904848ff40ad734 --- core/java/android/app/ActivityManager.java | 8 +++++++- .../com/android/server/am/ActivityManagerService.java | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 23fea71330157..af981f69d3b6a 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -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; /** * {@code diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e5579e29c2089..0e853755a9b9d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12036,6 +12036,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: "