commit b9116af29f971137e7bd6754c5d74d35aeeed05b
author Tadashi G. Takaoka <takaoka@google.com> Wed Nov 19 11:57:49 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Nov 19 11:57:49 2014 +0900
tree a8bbbf6598f7018f0a4cac94de3382ac99cacefa
parent 5c6766a58d2b22743f2d214f532a09646bca7610

Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null

Change-Id: Ic5cb55e24a2d843027ccc4e8e5d6954f9391c125

java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java

diff --git a/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java b/java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
index 013f024..0e7f471 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.Locale;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * A helper class to deal with subtype locales.
@@ -273,7 +274,7 @@
     }
 
     @Nonnull
-    public static String getSubtypeNameForLogging(@Nonnull final InputMethodSubtype subtype) {
+    public static String getSubtypeNameForLogging(@Nullable final InputMethodSubtype subtype) {
         if (subtype == null) {
             return "<null subtype>";
         }