diff options
4 files changed, 13 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index d48031505d5f..61415839ea2c 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10389,6 +10389,7 @@ package android.os { field public static final int BUGREPORT_FLAG_USE_PREDUMPED_UI_DATA = 1; // 0x1 field public static final int BUGREPORT_MODE_FULL = 0; // 0x0 field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1 + field public static final int BUGREPORT_MODE_ONBOARDING = 7; // 0x7 field public static final int BUGREPORT_MODE_REMOTE = 2; // 0x2 field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4 field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3 diff --git a/core/java/android/os/BugreportParams.java b/core/java/android/os/BugreportParams.java index d9d14b038237..0456a33580cf 100644 --- a/core/java/android/os/BugreportParams.java +++ b/core/java/android/os/BugreportParams.java @@ -81,7 +81,8 @@ public final class BugreportParams { BUGREPORT_MODE_REMOTE, BUGREPORT_MODE_WEAR, BUGREPORT_MODE_TELEPHONY, - BUGREPORT_MODE_WIFI + BUGREPORT_MODE_WIFI, + BUGREPORT_MODE_ONBOARDING }) public @interface BugreportMode {} @@ -121,6 +122,11 @@ public final class BugreportParams { public static final int BUGREPORT_MODE_WIFI = IDumpstate.BUGREPORT_MODE_WIFI; /** + * Options for a lightweight bugreport intended to be taken for onboarding-related flows. + */ + public static final int BUGREPORT_MODE_ONBOARDING = IDumpstate.BUGREPORT_MODE_ONBOARDING; + + /** * Defines acceptable flags for customizing bugreport requests. * @hide */ diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index a53c2fb44873..4dc76db518c4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -7409,6 +7409,9 @@ public class ActivityManagerService extends IActivityManager.Stub case BugreportParams.BUGREPORT_MODE_WIFI: type = "bugreportwifi"; break; + case BugreportParams.BUGREPORT_MODE_ONBOARDING: + type = "bugreportonboarding"; + break; default: throw new IllegalArgumentException( "Provided bugreport type is not correct, value: " diff --git a/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java b/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java index 3ba307be2311..1134714bce55 100644 --- a/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java +++ b/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java @@ -307,7 +307,8 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub { && mode != BugreportParams.BUGREPORT_MODE_REMOTE && mode != BugreportParams.BUGREPORT_MODE_WEAR && mode != BugreportParams.BUGREPORT_MODE_TELEPHONY - && mode != BugreportParams.BUGREPORT_MODE_WIFI) { + && mode != BugreportParams.BUGREPORT_MODE_WIFI + && mode != BugreportParams.BUGREPORT_MODE_ONBOARDING) { Slog.w(TAG, "Unknown bugreport mode: " + mode); throw new IllegalArgumentException("Unknown bugreport mode: " + mode); } |