Merge "Fix not to show a log with empty default ime" (c8dce896) · Commits · e / os / android_frameworks_base

services/java/com/android/server/InputMethodManagerService.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -733,7 +733,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	if (defIm == null && mMethodList.size() > 0) {		if (defIm == null && mMethodList.size() > 0) {
	defIm = InputMethodUtils.getMostApplicableDefaultIME(		defIm = InputMethodUtils.getMostApplicableDefaultIME(
	mSettings.getEnabledInputMethodListLocked());		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) {		if (defIm != null) {
	setSelectedInputMethodAndSubtypeLocked(defIm, NOT_A_SUBTYPE_ID, false);		setSelectedInputMethodAndSubtypeLocked(defIm, NOT_A_SUBTYPE_ID, false);