Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simranjit Kohli
2020-03-13 15:44:29 +00:00
committed by Android (Google) Code Review
parent 97a8c8a153 73da7fca64
commit a03b6abb5b
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

1
api/system-current.txt
View File

@@ -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

3
core/java/android/provider/Settings.java
View File

@@ -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";
/**