summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJustin Morey <jmorey@google.com>2014-07-24 09:16:35 -0500
committerJustin Morey <jmorey@google.com>2014-07-24 15:23:09 +0000
commit80440cc853611e77268d8c67db2279c10b2e076e (patch)
treed21fd2e77e366cc80155195b3ff99a9c9213d834 /core/java
parent4f994eb2ddbe68b0eada89dcaae34c079df55c7e (diff)
downloadframeworks_base-80440cc853611e77268d8c67db2279c10b2e076e.zip
frameworks_base-80440cc853611e77268d8c67db2279c10b2e076e.tar.gz
frameworks_base-80440cc853611e77268d8c67db2279c10b2e076e.tar.bz2
Expose setActiveProfileOwner() using @SystemApi
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af (cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index a193a34..1bbe5c4 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2083,7 +2083,6 @@ public class DevicePolicyManager {
/**
* @hide
- * @SystemApi
* Sets the given component as an active admin and registers the package as the profile
* owner for this user. The package must already be installed and there shouldn't be
* an existing profile owner registered for this user. Also, this method must be called
@@ -2097,6 +2096,7 @@ public class DevicePolicyManager {
* @throws IllegalArgumentException if packageName is null, the package isn't installed, or
* the user has already been set up.
*/
+ @SystemApi
public boolean setActiveProfileOwner(ComponentName admin, String ownerName)
throws IllegalArgumentException {
if (mService != null) {