Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec721632 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc"

parents 9147ce4c a3c1250a

core/java/android/os/UserManager.java

+6 −3
Original line number Diff line number Diff line
@@ -774,17 +774,20 @@ public class UserManager { 
    }



    /**

     * 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");