summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jonathan Scott <scottjonathan@google.com> 2019-09-05 17:31:12 +0100
committer Jonathan Scott <scottjonathan@google.com> 2019-09-05 17:31:12 +0100
commita5e4422d14b950a159562accbb8bd59cd1874f5d (patch)
tree22c9b8410accbff81fa3743ff35ce750c99982a0
parenta7496671dabfb877e00655011869d2c3edc5263b (diff)
Add MANAGED_PROVISIONING_DPC_DOWNLOADED.
Test: Just adding a constant Bug: 132261064 Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
-rw-r--r--core/java/android/provider/Settings.java12
-rw-r--r--core/tests/coretests/src/android/provider/SettingsBackupTest.java1
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 383d8dbce791..f7cfb577fc0e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5948,6 +5948,18 @@ public final class Settings {
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>
* Type: int (0 for false, 1 for true)
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index cd36ba746a39..2bc150a564b2 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -714,6 +714,7 @@ public class SettingsBackupTest {
Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE,
Settings.Secure.FLASHLIGHT_AVAILABLE,
Settings.Secure.FLASHLIGHT_ENABLED,
+ Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED,
Settings.Secure.CROSS_PROFILE_CALENDAR_ENABLED,
Settings.Secure.LOCATION_ACCESS_CHECK_INTERVAL_MILLIS,
Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,