summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2016-03-31 16:40:57 +0100
committerKenny Guy <kennyguy@google.com>2016-03-31 16:40:57 +0100
commitffa3840cf32cc3d02fc8d7a0f7b445dd9015b1a6 (patch)
tree2d7cad9ad2d85d35c4298331ced39e97130e92a1 /core/java
parent0b880795c12954f1b7818c78d6416d47f1df08dc (diff)
Allow PO to check if it is in a managed profile.
Method was @hide because we only intended to add managed users in a later release, however we added createAndManageUser which allows it. Bug: 27261765 Change-Id: I029f8ef35a3065f7fc598b5f854c8d8cdc9c555d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index e1afb1743843..9cf431ed06af 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -5588,10 +5588,9 @@ public class DevicePolicyManager {
}
/**
- * @hide
* Return if this user is a managed profile of another user. An admin can become the profile
* owner of a managed profile with {@link #ACTION_PROVISION_MANAGED_PROFILE} and of a managed
- * user with {@link #ACTION_PROVISION_MANAGED_USER}.
+ * user with {@link #createAndManageUser}
* @param admin Which profile owner this request is associated with.
* @return if this user is a managed profile of another user.
*/