commit 8833756d522e247f40b6824f642ee3f5a67e1086
author Tadashi G. Takaoka <takaoka@google.com> Wed Nov 19 03:03:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 19 03:03:50 2014 +0000
tree dce8f6df508df46cd2013ad4ae15c18f7f109289
parent 6db392637c4b7893351f61b045df322032801bcb
parent b9116af29f971137e7bd6754c5d74d35aeeed05b

am b9116af2: Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null

* commit 'b9116af29f971137e7bd6754c5d74d35aeeed05b':
  Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null

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>";
         }