aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-07-22 21:04:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-22 21:04:22 -0700
commit20c03e2d16de123bde5e81109b1aef45a0e18f24 (patch)
tree690194b3fedfb55c2188fedfe4347ec53ff962c9 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java
parent958e257eb4392341a08472be613bac1d5c5eb850 (diff)
parente6c51847426121246cc8b48f42f8f5668db71cdb (diff)
downloadlatinime-20c03e2d16de123bde5e81109b1aef45a0e18f24.tar.gz
latinime-20c03e2d16de123bde5e81109b1aef45a0e18f24.tar.xz
latinime-20c03e2d16de123bde5e81109b1aef45a0e18f24.zip
am e6c51847: Fix NPE in SubtypeLocale.getSubtypeDisplayName
* commit 'e6c51847426121246cc8b48f42f8f5668db71cdb': Fix NPE in SubtypeLocale.getSubtypeDisplayName
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java')
-rw-r--r--java/src/com/android/inputmethod/latin/RichInputMethodManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
index b09685886..56b1e3f61 100644
--- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
+++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java
@@ -134,7 +134,7 @@ public final class RichInputMethodManager {
final int currentIndex = getSubtypeIndexInList(currentSubtype, enabledSubtypes);
if (currentIndex == INDEX_NOT_FOUND) {
Log.w(TAG, "Can't find current subtype in enabled subtypes: subtype="
- + SubtypeLocale.getSubtypeDisplayName(currentSubtype));
+ + SubtypeLocale.getSubtypeNameForLogging(currentSubtype));
return false;
}
final int nextIndex = (currentIndex + 1) % enabledSubtypes.size();