drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
This commit is contained in:
Nicolas Prevot
2015-01-15 12:35:05 +00:00
committed by Android Git Automerger
parent 5304649ba8 a9f9c4b90a
commit 97f1ac016b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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