diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 0459e6ab5a5b..8192762c4d63 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 3660ddcb9ac8..4c05497479c0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 = @@ -2270,11 +2268,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. */ public static final String ACTION_ADMIN_POLICY_COMPLIANCE = |