diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-02-06 15:28:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 15:28:21 +0000 |
| commit | 70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1 (patch) | |
| tree | 81e3c24cee2105110a731b0bdf57426aeea7a2b1 | |
| parent | eceae03f6a21b36baddabe4ca5a2c1d9d238240a (diff) | |
| parent | 8debf21357477083a716275e2a32cb7169d42c47 (diff) | |
| download | frameworks_base-70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1.zip frameworks_base-70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1.tar.gz frameworks_base-70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1.tar.bz2 | |
am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
* commit '8debf21357477083a716275e2a32cb7169d42c47':
Fix mangled javadoc for setPermittedInputMethods.
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 1ed709b..cf06cb7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2933,9 +2933,9 @@ public class DevicePolicyManager { * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageNames List of input method package names. - * @return true if setting the restriction succeeded. It will fail if there is - * one or more input method enabled, that are not in the list or user if the foreground - * user. + * @return true if setting the restriction succeeded. It will fail if there are + * one or more non-system input methods currently enabled that are not in + * the packageNames list. */ public boolean setPermittedInputMethods(ComponentName admin, List<String> packageNames) { if (mService != null) { |