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

Commit 4c297e06 authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Make android.os.BugreportParams.BUGREPORT_MODE_MAX_VALUE flagged" into main

parents ae5ecaa3 21a52872
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2148,7 +2148,7 @@ package android.os {
  }

  public final class BugreportParams {
    field 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
  }

  public class Build {
+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package android.os;

import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.annotation.TestApi;
@@ -133,6 +134,7 @@ public final class BugreportParams {
     * The maximum value of supported bugreport mode.
     * @hide
     */
    @FlaggedApi(android.os.Flags.FLAG_BUGREPORT_MODE_MAX_VALUE)
    @TestApi
    public static final int BUGREPORT_MODE_MAX_VALUE = BUGREPORT_MODE_ONBOARDING;

+7 −0
Original line number Diff line number Diff line
@@ -27,3 +27,10 @@ flag {
    description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."
    bug: "299069460"
}

flag {
    name: "bugreport_mode_max_value"
    namespace: "telephony"
    description: "Introduce a constant as maximum value of bugreport mode."
    bug: "305067125"
}