diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-19 03:03:50 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 03:03:50 +0000 |
| commit | 8833756d522e247f40b6824f642ee3f5a67e1086 (patch) | |
| tree | dce8f6df508df46cd2013ad4ae15c18f7f109289 /java/src/com/android/inputmethod | |
| parent | 6db392637c4b7893351f61b045df322032801bcb (diff) | |
| parent | b9116af29f971137e7bd6754c5d74d35aeeed05b (diff) | |
| download | latinime-8833756d522e247f40b6824f642ee3f5a67e1086.tar.gz latinime-8833756d522e247f40b6824f642ee3f5a67e1086.tar.xz latinime-8833756d522e247f40b6824f642ee3f5a67e1086.zip | |
am b9116af2: Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null
* commit 'b9116af29f971137e7bd6754c5d74d35aeeed05b':
Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java | 3 |
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>"; } |