Merge "Factory Reset Protection via MainUser" (8a7a51f8) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -36274,7 +36274,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 @Deprecated 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 −0

Original line number	Diff line number	Diff line
		@@ -10883,6 +10883,7 @@ 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";

+19 −1

Original line number	Diff line number	Diff line
		@@ -6210,6 +6210,7 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.DEFAULT_DNS_SERVER);
		MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_NETWORK_MODE);
		MOVED_TO_GLOBAL.add(Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY);
		MOVED_TO_GLOBAL.add(Settings.Global.SECURE_FRP_MODE);
		}

		/** @hide */
		@@ -7072,7 +7073,10 @@ public final class Settings {
		* device is removed from this mode.
		* <p>
		* Type: int (0 for false, 1 for true)
		*
		* @deprecated Use Global.SECURE_FRP_MODE
		*/
		@Deprecated
		@Readable
		public static final String SECURE_FRP_MODE = "secure_frp_mode";

		@@ -11897,7 +11901,21 @@ public final class Settings {
		public static final String DEVICE_PROVISIONED = "device_provisioned";

		/**
		* Whether bypassing the device policy management role holder qualifcation is allowed,
		* Indicates whether the device is under restricted secure FRP mode.
		* Secure FRP mode is enabled when the device is under FRP. On solving of FRP challenge,
		* device is removed from this mode.
		* <p>
		* Type: int (0 for false, 1 for true)
		*
		* @hide
		*/
		@SystemApi
		@Readable
		@SuppressLint("NoSettingsProvider")
		public static final String SECURE_FRP_MODE = "secure_frp_mode";

		/**
		* Whether bypassing the device policy management role holder qualification is allowed,
		* (0 = false, 1 = true).
		*
		* @hide

+1 −1

Original line number	Diff line number	Diff line
		@@ -1742,7 +1742,7 @@ public class LockPatternUtils {
		}

		public static boolean userOwnsFrpCredential(Context context, UserInfo info) {
		return info != null && info.isPrimary() && info.isAdmin() && frpCredentialEnabled(context);
		return info != null && info.isMain() && info.isAdmin() && frpCredentialEnabled(context);
		}

		public static boolean frpCredentialEnabled(Context context) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,7 @@ public class SettingsBackupTest {
		Settings.Global.RESTRICTED_NETWORKING_MODE,
		Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT,
		Settings.Global.SAFE_BOOT_DISALLOWED,
		Settings.Global.SECURE_FRP_MODE,
		Settings.Global.SELINUX_STATUS,
		Settings.Global.SELINUX_UPDATE_CONTENT_URL,
		Settings.Global.SELINUX_UPDATE_METADATA_URL,