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

Add MANAGED_PROVISIONING_DPC_DOWNLOADED.

Browse Source 
Test: Just adding a constant
Bug: 132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
This commit is contained in:
Jonathan Scott
2019-05-24 11:33:58 +01:00
parent c71fb23b4b
commit fb77e63aa5
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5958,6 +5958,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>

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

@@ -721,7 +721,8 @@ public class SettingsBackupTest {
Settings.Secure.BIOMETRIC_DEBUG_ENABLED, Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED, Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
Settings.Secure.FACE_UNLOCK_DIVERSITY_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 @Test
public void systemSettingsBackedUpOrBlacklisted() { public void systemSettingsBackedUpOrBlacklisted() {