diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-09-05 17:31:12 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 02:56:24 +0000 |
| commit | 1302073b4c9469fb088294819298f0800593780f (patch) | |
| tree | 2ec349b63d4ec48390014fbac5a64e5c44281e55 | |
| parent | aaba8ef289dee0c143b3dc0fe47e6b9595f22c65 (diff) | |
| download | android_frameworks_base-1302073b4c9469fb088294819298f0800593780f.tar.gz android_frameworks_base-1302073b4c9469fb088294819298f0800593780f.tar.bz2 android_frameworks_base-1302073b4c9469fb088294819298f0800593780f.zip | |
Add MANAGED_PROVISIONING_DPC_DOWNLOADED.
Test: Just adding a constant
Bug: 132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
(cherry picked from commit a5e4422d14b950a159562accbb8bd59cd1874f5d)
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 383d8dbce79..f7cfb577fc0 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 cd36ba746a3..2bc150a564b 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, |