diff options
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index d099629f735d..48b538b521b5 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -442,7 +442,13 @@ public class UserManager { * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() + * @deprecated As the ability to have a managed profile on a fully-managed device has been + * removed from the platform, this restriction will be silently ignored when applied by the + * device owner. + * When the device is provisioned with a managed profile on an organization-owned device, + * the managed profile could not be removed anyway. */ + @Deprecated public static final String DISALLOW_REMOVE_MANAGED_PROFILE = "no_remove_managed_profile"; /** @@ -589,7 +595,11 @@ public class UserManager { * @see DevicePolicyManager#addUserRestriction(ComponentName, String) * @see DevicePolicyManager#clearUserRestriction(ComponentName, String) * @see #getUserRestrictions() + * @deprecated As the ability to have a managed profile on a fully-managed device has been + * removed from the platform, this restriction will be silently ignored when applied by the + * device owner. */ + @Deprecated public static final String DISALLOW_ADD_MANAGED_PROFILE = "no_add_managed_profile"; /** |