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

Commit 058fff5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make SECURE_FRP_MODE public"

parents 7bde8fca e97ef096

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36189,6 +36189,7 @@ package android.provider { 
    field public static final String RADIO_CELL = "cell";

    field public static final String RADIO_NFC = "nfc";

    field public static final String RADIO_WIFI = "wifi";

    field public static final String SECURE_FRP_MODE = "secure_frp_mode";

    field @Deprecated public static final String SHOW_PROCESSES = "show_processes";

    field public static final String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in";

    field public static final String TRANSITION_ANIMATION_SCALE = "transition_animation_scale";

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -10913,7 +10913,6 @@ package android.provider { 
    field public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";

    field public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";

    field public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt";

    field public static final String SECURE_FRP_MODE = "secure_frp_mode";

    field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";

    field public static final String TETHER_SUPPORTED = "tether_supported";

    field public static final String THEATER_MODE_ON = "theater_mode_on";

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -11950,9 +11950,7 @@ public final class Settings { 
         * <p>

         * Type: int (0 for false, 1 for true)

         *

         * @hide

         */

        @SystemApi

        @Readable

        @SuppressLint("NoSettingsProvider")

        public static final String SECURE_FRP_MODE = "secure_frp_mode";