diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-01-15 12:42:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 12:42:47 +0000 |
| commit | 97c1882719437d4b4d8ce99d53ffc400975fdd5e (patch) | |
| tree | 9d08c4663c907d366a49aa2548cd00d31fd8cb9a /core/java/android/os | |
| parent | 19039a632b096647ecdc75692bfe178fbabe9a78 (diff) | |
| parent | 97f1ac016b6c116dc2964ba60ffe1e405578756a (diff) | |
| download | frameworks_base-97c1882719437d4b4d8ce99d53ffc400975fdd5e.zip frameworks_base-97c1882719437d4b4d8ce99d53ffc400975fdd5e.tar.gz frameworks_base-97c1882719437d4b4d8ce99d53ffc400975fdd5e.tar.bz2 | |
am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit '97f1ac016b6c116dc2964ba60ffe1e405578756a':
Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 5e1df01..d124a49 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -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"; |