From fb77e63aa5054326ad8e13094cb06d69bb5e6944 Mon Sep 17 00:00:00 2001 From: Jonathan Scott Date: Fri, 24 May 2019 11:33:58 +0100 Subject: [PATCH] Add MANAGED_PROVISIONING_DPC_DOWNLOADED. Test: Just adding a constant Bug: 132261064 Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 --- core/java/android/provider/Settings.java | 12 ++++++++++++ .../src/android/provider/SettingsBackupTest.java | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5308cd3a09261..7df1ebe15d44f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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. + * + *

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

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. *

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 88bda9d640848..89ba3df287b44 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -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() {