Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev

This commit is contained in:
Kenny Guy
2015-02-06 15:22:22 +00:00
committed by Android (Google) Code Review

View File

@@ -2933,9 +2933,9 @@ public class DevicePolicyManager {
* *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param packageNames List of input method package names. * @param packageNames List of input method package names.
* @return true if setting the restriction succeeded. It will fail if there is * @return true if setting the restriction succeeded. It will fail if there are
* one or more input method enabled, that are not in the list or user if the foreground * one or more non-system input methods currently enabled that are not in
* user. * the packageNames list.
*/ */
public boolean setPermittedInputMethods(ComponentName admin, List<String> packageNames) { public boolean setPermittedInputMethods(ComponentName admin, List<String> packageNames) {
if (mService != null) { if (mService != null) {