Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cd9eb7c authored by Wei Liu's avatar Wei Liu Committed by android-build-merger
Browse files

Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its... 

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

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
parents a9d12e8f 05c2c22a

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

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

+3 −0
Original line number Diff line number Diff line
@@ -12059,6 +12059,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: "