Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." (774da779) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -5958,6 +5958,18 @@ public final class Settings {
		@Deprecated
		public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED;

		/**
		* Indicates whether a DPC has been downloaded during provisioning.
		*
		* <p>Type: int (0 for false, 1 for true)
		*
		* <p>If this is true, then any attempts to begin setup again should result in factory reset
		*
		* @hide
		*/
		public static final String MANAGED_PROVISIONING_DPC_DOWNLOADED =
		"managed_provisioning_dpc_downloaded";

		/**
		* Indicates whether the current user has completed setup via the setup wizard.
		* <p>

+2 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,8 @@ public class SettingsBackupTest {
		Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
		Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
		Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,
		Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED);
		Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,
		Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED);

		@Test
		public void systemSettingsBackedUpOrBlacklisted() {