Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev

This commit is contained in:
Yohei Yukawa
2014-10-31 03:09:04 +00:00
committed by Android (Google) Code Review

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);