am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev

* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.
This commit is contained in:
Kenny Guy
2015-02-06 15:37:53 +00:00
committed by Android Git Automerger

View File

@@ -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) {