am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime"

* commit 'b6e004261cc5c1b9b9ab338ce30896f537182336':
  Fix not to show a log with empty default ime
This commit is contained in:
Elliott Hughes
2014-10-30 03:19:32 +00:00
committed by Android Git Automerger

View File

@@ -774,7 +774,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (defIm == null && mMethodList.size() > 0) {
defIm = InputMethodUtils.getMostApplicableDefaultIME(
mSettings.getEnabledInputMethodListLocked());
Slog.i(TAG, "No default found, using " + defIm.getId());
if (defIm != null) {
Slog.i(TAG, "Default found, using " + defIm.getId());
} else {
Slog.i(TAG, "No default found");
}
}
if (defIm != null) {
setSelectedInputMethodAndSubtypeLocked(defIm, NOT_A_SUBTYPE_ID, false);