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

Commit a9f9c4b9 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev

parents 2cd3ac47 b14ed956

core/java/android/os/UserManager.java

+4 −2
Original line number Diff line number Diff line
@@ -400,8 +400,10 @@ public class UserManager { 
     *

     * <p/>Key for application restrictions.

     * <p/>Type: Boolean

     * @see android.app.admin.DevicePolicyManager#setApplicationRestrictions()

     * @see android.app.admin.DevicePolicyManager#getApplicationRestrictions()

     * @see android.app.admin.DevicePolicyManager#setApplicationRestrictions(

     *      android.content.ComponentName, String, Bundle)

     * @see android.app.admin.DevicePolicyManager#getApplicationRestrictions(

     *      android.content.ComponentName, String)

     */

    public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";