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

Commit 97166e07 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager... 

am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev

* commit '9b07760d':
  Fix javadoc in UserManager mentioning application restrictions.
parents 67fd871b 9b07760d

core/java/android/os/UserManager.java

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

     * <p/>Key for application restrictions.

     * <p/>Type: Boolean

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

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

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

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

     */

    public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";