commit 2cd9eb7c353a2e4d2ad63ec7ff705385a29aee87
author Wei Liu <luciferleo@google.com> Thu Jul 14 00:15:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 00:15:25 2016 +0000
tree e1b865b973a7eb570f7e14cbdebbc8475b6eef1f
parent a9d12e8fb0445055e19c936d2cb0a4eca84c75c7
parent 05c2c22a80240310ba3f1a3caccc1d6802fd50c1

Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a
am: 05c2c22a80

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029

core/java/android/app/ActivityManager.java

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 22a1fce..419f723 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -93,7 +93,8 @@
     @IntDef({
             BUGREPORT_OPTION_FULL,
             BUGREPORT_OPTION_INTERACTIVE,
-            BUGREPORT_OPTION_REMOTE
+            BUGREPORT_OPTION_REMOTE,
+            BUGREPORT_OPTION_WEAR
     })
     public @interface BugreportMode {}
     /**
@@ -114,6 +115,11 @@
      * @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

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1c6321f..b32199f5 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12059,6 +12059,9 @@
             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: "