diff options
| author | Antoan Angelov <arangelov@google.com> | 2019-03-25 12:53:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-25 12:53:43 +0000 |
| commit | 4d7990f458625eeac4147e382dadb515ae97e7a4 (patch) | |
| tree | 350a492be0e7327bdf9d63333ac87be5b3bbfb9f /core/java/android | |
| parent | 18fb6cdb5fd22198caec1fe4c8aea8a026816bb4 (diff) | |
| parent | 1b146c23062b13b81d875a1283e345bd90ec4da6 (diff) | |
Merge "Remove PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 7 |
1 files changed, 0 insertions, 7 deletions
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 = |