Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
This commit is contained in:
Nicolas Prevot
2014-11-19 09:55:44 +00:00
committed by Android Git Automerger
parent 4be155e81a 76ea69b35e
commit 439f17e622
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/UserManager.java
View File

@@ -383,8 +383,8 @@ public class UserManager {
* *
* <p/>Key for application restrictions. * <p/>Key for application restrictions.
* <p/>Type: Boolean * <p/>Type: Boolean
* @see android.app.admin.DevicePolicyManager#addApplicationRestriction() * @see android.app.admin.DevicePolicyManager#setApplicationRestrictions()
* @see android.app.admin.DevicePolicyManager#getApplicationRestriction() * @see android.app.admin.DevicePolicyManager#getApplicationRestrictions()
*/ */
public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending"; public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";