Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev

Browse Source 
am: b01fe73ed3

Change-Id: Idd7424cf00a3c5d8d41e3e051d78d0ac4d6c4a19
This commit is contained in:
Jonathan Scott
2019-09-06 04:44:06 -07:00
committed by android-build-merger
parent 122636b4f5 b01fe73ed3
commit 68f73efcb9
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -5956,6 +5956,18 @@ public final class Settings {
@Deprecated @Deprecated
public static final String DEVICE_PROVISIONED = Global.DEVICE_PROVISIONED; 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. * Indicates whether the current user has completed setup via the setup wizard.
* <p> * <p>

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -716,6 +716,7 @@ public class SettingsBackupTest {
Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE, Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE,
Settings.Secure.FLASHLIGHT_AVAILABLE, Settings.Secure.FLASHLIGHT_AVAILABLE,
Settings.Secure.FLASHLIGHT_ENABLED, Settings.Secure.FLASHLIGHT_ENABLED,
Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED,
Settings.Secure.CROSS_PROFILE_CALENDAR_ENABLED, Settings.Secure.CROSS_PROFILE_CALENDAR_ENABLED,
Settings.Secure.LOCATION_ACCESS_CHECK_INTERVAL_MILLIS, Settings.Secure.LOCATION_ACCESS_CHECK_INTERVAL_MILLIS,
Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS, Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,