commit ec721632d19fe96abf15ed5dcf25de7ac19fdfae
author Makoto Onuki <omakoto@google.com> Wed Oct 28 17:20:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 17:20:03 2015 +0000
tree 33a621c475b8e9b46a4a92f8fde9943e311659f5
parent 9147ce4cf99d8fd06be7fb88d280503dd214777c
parent a3c1250a2fc36e7315b377b1babe9d03ae41721a

Merge "Fix javadoc"

core/java/android/os/UserManager.java

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 909d33c..17e1a28 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -774,17 +774,20 @@
     }
 
     /**
-     * This will no longer work.  Use {@link #setUserRestriction(String, boolean)} instead.
+     * This will no longer work.  Device owners and profile owners should use
+     * {@link DevicePolicyManager#addUserRestriction(ComponentName, String)} instead.
      */
+    // System apps should use UserManager.setUserRestriction() instead.
     @Deprecated
     public void setUserRestrictions(Bundle restrictions) {
         throw new UnsupportedOperationException("This method is no longer supported");
     }
 
     /**
-     * This will no longer work.  Use {@link #setUserRestriction(String, boolean, UserHandle)}
-     * instead.
+     * This will no longer work.  Device owners and profile owners should use
+     * {@link DevicePolicyManager#addUserRestriction(ComponentName, String)} instead.
      */
+    // System apps should use UserManager.setUserRestriction() instead.
     @Deprecated
     public void setUserRestrictions(Bundle restrictions, UserHandle userHandle) {
         throw new UnsupportedOperationException("This method is no longer supported");