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

Commit 00f8bd34 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Secure FRP : Remove @SystemApi annotation." into rvc-dev am: a03b6abb... 

Merge "Secure FRP : Remove @SystemApi annotation." into rvc-dev am: a03b6abb am: d97581a3 am: 0b1b7aa4

Change-Id: I6b2cfcd5580b3a272a748883c0d2a95d7a7ff8a5
parents 5ffffaf1 0b1b7aa4

api/current.txt

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

    field public static final String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";

    field public static final String RTT_CALLING_MODE = "rtt_calling_mode";

    field public static final String SECURE_FRP_MODE = "secure_frp_mode";

    field public static final String SELECTED_INPUT_METHOD_SUBTYPE = "selected_input_method_subtype";

    field public static final String SETTINGS_CLASSNAME = "settings_classname";

    field public static final String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";

api/system-current.txt

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

    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

    field public static final String ODI_CAPTIONS_ENABLED = "odi_captions_enabled";

    field public static final String SECURE_FRP_MODE = "secure_frp_mode";

    field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages";

    field public static final String USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa

core/java/android/provider/Settings.java

+0 −3
Original line number Diff line number Diff line
@@ -6090,10 +6090,7 @@ public final class Settings { 
         * device is removed from this mode.

         * <p>

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

         *

         * @hide

         */

        @SystemApi

        public static final String SECURE_FRP_MODE = "secure_frp_mode";















        /**