commit 5bf68027cf502c2835ad258aec05544958fcd354
author Makoto Onuki <omakoto@google.com> Wed Jan 27 13:49:19 2016 -0800
committer Makoto Onuki <omakoto@google.com> Wed Jan 27 14:07:41 2016 -0800
tree 229dc5a6569c48a134bf0048f213eb296bddc50d
parent 5ddbc2af0c248e73c5b8f7c37c7a24775798326b

Make DPM.clearProfileOwner() public.

Bug 26827204

Change-Id: Ib32e5370b493aa3e36b869d9ed3d78782df4c895

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 879d663..86011c4 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -3185,15 +3185,14 @@
     }
 
     /**
-     * @hide
      * Clears the active profile owner and removes all user restrictions. The caller must
      * be from the same package as the active profile owner for this user, otherwise a
      * SecurityException will be thrown.
      *
+     * <p>This doesn't work for managed profile owners.
+     *
      * @param admin The component to remove as the profile owner.
-     * @return
      */
-    @SystemApi
     public void clearProfileOwner(@NonNull ComponentName admin) {
         if (mService != null) {
             try {