Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: ba910df

* commit 'ba910dfaddb2e2926c9c52fbc6ca3f2f8cf1028b':
  Fix not to show a log with empty default ime
This commit is contained in:
Yohei Yukawa
2014-10-31 03:35:40 +00:00
committed by android-build-merger
parent 19745dc0f1 ba910dfadd
commit d3f51271f5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/InputMethodManagerService.java
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);