diff options
| author | 2015-01-15 12:50:29 +0000 | |
|---|---|---|
| committer | 2015-01-15 12:50:29 +0000 | |
| commit | a55e3ed8bf726e61186d5bb2271c3eab597b44d9 (patch) | |
| tree | 00b125cde755e341cb6077dfd4b22ff8f137b979 | |
| parent | b66fa17901d43a79956cd24882969d2b59a07f8b (diff) | |
| parent | 97c1882719437d4b4d8ce99d53ffc400975fdd5e (diff) | |
am 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit '97c1882719437d4b4d8ce99d53ffc400975fdd5e':
Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
| -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 5e1df01b70e5..d124a499f66d 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"; |