nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am b9116af2: Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null 

* commit 'b9116af29f971137e7bd6754c5d74d35aeeed05b':
  Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null
main
Tadashi G. Takaoka 2014-11-19 03:03:50 +00:00 committed by Android Git Automerger
parent 6db392637c b9116af29f
commit 8833756d52
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java
View File

@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/** /**
* A helper class to deal with subtype locales. * A helper class to deal with subtype locales.
@ -273,7 +274,7 @@ public final class SubtypeLocaleUtils {
} }
@Nonnull @Nonnull
public static String getSubtypeNameForLogging(@Nonnull final InputMethodSubtype subtype) { public static String getSubtypeNameForLogging(@Nullable final InputMethodSubtype subtype) {
if (subtype == null) { if (subtype == null) {
return "<null subtype>"; return "<null subtype>";
} }