diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-02-06 16:44:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-06 16:44:42 +0000 |
| commit | d22517a7084fd3a56f22490b405c002086dc14ac (patch) | |
| tree | db23ea137f801bc0d2803195f02d9d2c54d4838f | |
| parent | 78264e1d3945136b2f0f7d75de159afab66121da (diff) | |
| parent | afca06105c1344dade61ec5812bf605b11de0f1c (diff) | |
| download | frameworks_base-d22517a7084fd3a56f22490b405c002086dc14ac.zip frameworks_base-d22517a7084fd3a56f22490b405c002086dc14ac.tar.gz frameworks_base-d22517a7084fd3a56f22490b405c002086dc14ac.tar.bz2 | |
am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
automerge: afca061
* commit 'afca06105c1344dade61ec5812bf605b11de0f1c':
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 ecf25fc..af48909 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2928,9 +2928,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) { |