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

Commit 9fbfb01e authored by Elis Elliott's avatar Elis Elliott Committed by Android (Google) Code Review
Browse files

Merge "Add new bugreport mode for debugging onboarding." into main

parents 24c938c9 fcd85310

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/os/BugreportParams.java

+7 −1
Original line number Diff line number Diff line
@@ -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 {}
@@ -120,6 +121,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

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

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

services/core/java/com/android/server/os/BugreportManagerServiceImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }