Fix SubtypeLocaleUtils.getSubtypeNameForLogging accepting null
Change-Id: Ic5cb55e24a2d843027ccc4e8e5d6954f9391c125main
parent
5c6766a58d
commit
b9116af29f
|
@ -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>";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue