diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-24 16:39:24 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-05-24 16:43:13 +0900 |
| commit | c60a846e219ead1a40307d1a562013c38ea81b9d (patch) | |
| tree | 260108b5f30452388b9008e8d53e22021e9040e9 /java/src | |
| parent | 1e1235feeb5454dc8dd76d68dbf634b35d2d20f2 (diff) | |
| download | latinime-c60a846e219ead1a40307d1a562013c38ea81b9d.tar.gz latinime-c60a846e219ead1a40307d1a562013c38ea81b9d.tar.xz latinime-c60a846e219ead1a40307d1a562013c38ea81b9d.zip | |
Fix NPE in Settings.updateCustomInputStylesSummary
Change-Id: I7822adf407046098f97bf60da9382910c0a40209
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AdditionalSubtype.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java index ffdbfbb67..14aad2d4c 100644 --- a/java/src/com/android/inputmethod/latin/AdditionalSubtype.java +++ b/java/src/com/android/inputmethod/latin/AdditionalSubtype.java @@ -28,6 +28,7 @@ import android.view.inputmethod.InputMethodSubtype; import java.util.ArrayList; public class AdditionalSubtype { + private static final InputMethodSubtype EMPTY_SUBTYPE_ARRAY = new InputMethodSubtype[0]; private AdditionalSubtype() { // This utility class is not publicly instantiable. @@ -86,7 +87,7 @@ public class AdditionalSubtype { public static InputMethodSubtype[] createAdditionalSubtypesArray(String prefSubtypes) { if (TextUtils.isEmpty(prefSubtypes)) { - return null; + return EMPTY_SUBTYPE_ARRAY; } final String[] prefSubtypeArray = prefSubtypes.split(PREF_SUBTYPE_SEPARATOR); final ArrayList<InputMethodSubtype> subtypesList = |