aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-19 11:57:49 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-11-19 11:57:49 +0900
commitb9116af29f971137e7bd6754c5d74d35aeeed05b (patch)
treea8bbbf6598f7018f0a4cac94de3382ac99cacefa /java/src/com/android/inputmethod/latin
parent5c6766a58d2b22743f2d214f532a09646bca7610 (diff)
downloadlatinime-b9116af29f971137e7bd6754c5d74d35aeeed05b.tar.gz
latinime-b9116af29f971137e7bd6754c5d74d35aeeed05b.tar.xz
latinime-b9116af29f971137e7bd6754c5d74d35aeeed05b.zip
Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null
Change-Id: Ic5cb55e24a2d843027ccc4e8e5d6954f9391c125
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
index 013f024c0..0e7f4717d 100644
--- a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.Locale;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
/**
* A helper class to deal with subtype locales.
@@ -273,7 +274,7 @@ public final class SubtypeLocaleUtils {
}
@Nonnull
- public static String getSubtypeNameForLogging(@Nonnull final InputMethodSubtype subtype) {
+ public static String getSubtypeNameForLogging(@Nullable final InputMethodSubtype subtype) {
if (subtype == null) {
return "<null subtype>";
}