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

Commit 1f4483b6 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Expose onboarding bugreport params as a public API" into main

parents b3929115 d4eab018

core/api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -10434,9 +10434,11 @@ package android.os { 
    method public int getFlags();

    method public int getFlags();

    method public int getMode();

    method public int getMode();

    field public static final int BUGREPORT_FLAG_DEFER_CONSENT = 2; // 0x2

    field public static final int BUGREPORT_FLAG_DEFER_CONSENT = 2; // 0x2

    field @FlaggedApi("android.app.admin.flags.onboarding_bugreport_v2_enabled") public static final int BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL = 4; // 0x4

    field public static final int BUGREPORT_FLAG_USE_PREDUMPED_UI_DATA = 1; // 0x1

    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_FULL = 0; // 0x0

    field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1

    field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1

    field @FlaggedApi("android.app.admin.flags.onboarding_bugreport_v2_enabled") 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_REMOTE = 2; // 0x2

    field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4

    field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4

    field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3

    field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3

core/api/test-current.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -2277,9 +2277,7 @@ package android.os { 
  }

  }





  public final class BugreportParams {

  public final class BugreportParams {

    field @FlaggedApi("android.app.admin.flags.onboarding_bugreport_v2_enabled") public static final int BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL = 4; // 0x4

    field @FlaggedApi("android.os.bugreport_mode_max_value") public static final int BUGREPORT_MODE_MAX_VALUE = 7; // 0x7

    field @FlaggedApi("android.os.bugreport_mode_max_value") public static final int BUGREPORT_MODE_MAX_VALUE = 7; // 0x7

    field @FlaggedApi("android.app.admin.flags.onboarding_bugreport_v2_enabled") public static final int BUGREPORT_MODE_ONBOARDING = 7; // 0x7

  }

  }





  public class Build {

  public class Build {

core/java/android/os/BugreportParams.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.IntDef; 
import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.TestApi;

import android.app.admin.flags.Flags;

import android.app.admin.flags.Flags;

import android.compat.annotation.UnsupportedAppUsage;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -127,12 +126,8 @@ public final class BugreportParams { 




    /**

    /**

     * Options for a lightweight bugreport intended to be taken for onboarding-related flows.

     * Options for a lightweight bugreport intended to be taken for onboarding-related flows.

     *

     * @hide

     */

     */

    @TestApi

    @FlaggedApi(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED)

    @FlaggedApi(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED)

    @UnsupportedAppUsage

    public static final int BUGREPORT_MODE_ONBOARDING = IDumpstate.BUGREPORT_MODE_ONBOARDING;

    public static final int BUGREPORT_MODE_ONBOARDING = IDumpstate.BUGREPORT_MODE_ONBOARDING;





    /**

    /**
@@ -180,10 +175,7 @@ public final class BugreportParams { 
     * The bugreport may be retrieved multiple times using

     * The bugreport may be retrieved multiple times using

     * {@link BugreportManager#retrieveBugreport(

     * {@link BugreportManager#retrieveBugreport(

     * String, ParcelFileDescriptor, Executor, BugreportManager.BugreportCallback)}.

     * String, ParcelFileDescriptor, Executor, BugreportManager.BugreportCallback)}.

     *

     * @hide

     */

     */

    @TestApi

    @FlaggedApi(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED)

    @FlaggedApi(Flags.FLAG_ONBOARDING_BUGREPORT_V2_ENABLED)

    public static final int BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL =

    public static final int BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL =

            IDumpstate.BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL;

            IDumpstate.BUGREPORT_FLAG_KEEP_BUGREPORT_ON_RETRIEVAL;