commit c8dce8966b84203befb87a24a9d2d8ee87a39f7b
author Elliott Hughes <enh@google.com> Thu Oct 30 03:01:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 30 03:02:01 2014 +0000
tree 2336e2e0f68d57520e921b751e9274567dd53a1f
parent e5fe7f3f4069b176a0465617dceb630a52b710c0
parent e6ef68b15ae2ed4033501ceb5bd89e581c7a57fb

Merge "Fix not to show a log with empty default ime"

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

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index a996dbd..20133be 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -733,7 +733,11 @@
         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);