diff options
| author | 2014-11-19 09:46:52 +0000 | |
|---|---|---|
| committer | 2014-11-19 09:46:54 +0000 | |
| commit | 76ea69b35e45f4b23dfb7b39c6cd790b00576526 (patch) | |
| tree | c419cab8a6fcc851cac0a85361af4c0b0a4d3294 | |
| parent | a489f0b3d9007d94ba514bf4ce71ce9957147e33 (diff) | |
| parent | 34b6e35ba67a1dd4b770fbf80fe8f3dc1e1e01e3 (diff) | |
Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev
| -rw-r--r-- | core/java/android/os/UserManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index bd6eeea62452..ffbed940d440 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -383,8 +383,8 @@ public class UserManager { * * <p/>Key for application restrictions. * <p/>Type: Boolean - * @see android.app.admin.DevicePolicyManager#addApplicationRestriction() - * @see android.app.admin.DevicePolicyManager#getApplicationRestriction() + * @see android.app.admin.DevicePolicyManager#setApplicationRestrictions() + * @see android.app.admin.DevicePolicyManager#getApplicationRestrictions() */ public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending"; |