From a5e4422d14b950a159562accbb8bd59cd1874f5d Mon Sep 17 00:00:00 2001 From: Jonathan Scott Date: Thu, 5 Sep 2019 17:31:12 +0100 Subject: [PATCH] Add MANAGED_PROVISIONING_DPC_DOWNLOADED. Test: Just adding a constant Bug: 132261064 Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9 --- core/java/android/provider/Settings.java | 12 ++++++++++++ .../src/android/provider/SettingsBackupTest.java | 1 + 2 files changed, 13 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 383d8dbce7917..f7cfb577fc0e1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5947,6 +5947,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 cd36ba746a391..2bc150a564b21 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,