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

Commit 97c18827 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for... 

am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev

* commit '97f1ac01':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
parents 19039a63 97f1ac01

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