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

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

Browse Source 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
This commit is contained in:
Nicolas Prevot
2014-11-19 10:01:51 +00:00
committed by Android Git Automerger
parent ea3219ffa9 439f17e622
commit 9b07760dbc
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";