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

Merge "Remove PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE"

Browse Source
This commit is contained in:
Antoan Angelov
2019-03-25 12:53:43 +00:00
committed by Android (Google) Code Review
parent 18fb6cdb5f 1b146c2306
commit 4d7990f458
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -6952,7 +6952,6 @@ package android.app.admin {
field public static final int PRIVATE_DNS_SET_NO_ERROR = 0; // 0x0
field public static final int PROVISIONING_MODE_FULLY_MANAGED_DEVICE = 1; // 0x1
field public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2; // 0x2
field public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3; // 0x3
field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2
field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1
field public static final int SKIP_SETUP_WIZARD = 1; // 0x1

7
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2226,7 +2226,6 @@ public class DevicePolicyManager {
* <ul>
* <li>{@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}</li>
* <li>{@link #PROVISIONING_MODE_MANAGED_PROFILE}</li>
* <li>{@link #PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE}</li>
* </ul>
*
* <p>The target activity may also return the account that needs to be migrated from primary
@@ -2253,7 +2252,6 @@ public class DevicePolicyManager {
* <ul>
* <li>{@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}</li>
* <li>{@link #PROVISIONING_MODE_MANAGED_PROFILE}</li>
* <li>{@link #PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE}</li>
* </ul>
*/
public static final String EXTRA_PROVISIONING_MODE =
@@ -2269,11 +2267,6 @@ public class DevicePolicyManager {
*/
public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2;
/**
* The provisioning mode for managed profile on a fully managed device.
*/
public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3;
/**
* Activity action: Starts the administrator to show policy compliance for the provisioning.
*/