commit 80440cc853611e77268d8c67db2279c10b2e076e
author Justin Morey <jmorey@google.com> Thu Jul 24 09:16:35 2014 -0500
committer Justin Morey <jmorey@google.com> Thu Jul 24 15:23:09 2014 +0000
tree d21fd2e77e366cc80155195b3ff99a9c9213d834
parent 4f994eb2ddbe68b0eada89dcaae34c079df55c7e

Expose setActiveProfileOwner() using @SystemApi

Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
(cherry picked from commit 85db24136eefb01341760208541563aba05ce82e)

core/java/android/app/admin/DevicePolicyManager.java

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 @@
 
     /**
      * @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 @@
      * @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) {