diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-24 00:50:37 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 00:50:37 -0700 |
| commit | 516b785ce03fb7dba1b9305e2635e9d41c9a5a66 (patch) | |
| tree | 1647dab2a4e6418fa0cfdc5ec098518d2ca4f3dd /java/src | |
| parent | 8822d5a346d4b5d2f5c689bb78d660c3ff28fe98 (diff) | |
| parent | bc48a8f7ab0d9003a9c97ceb7d85bcf0502785a6 (diff) | |
| download | latinime-516b785ce03fb7dba1b9305e2635e9d41c9a5a66.tar.gz latinime-516b785ce03fb7dba1b9305e2635e9d41c9a5a66.tar.xz latinime-516b785ce03fb7dba1b9305e2635e9d41c9a5a66.zip | |
am bc48a8f7: am c60a846e: Fix NPE in Settings.updateCustomInputStylesSummary
* commit 'bc48a8f7ab0d9003a9c97ceb7d85bcf0502785a6':
Fix NPE in Settings.updateCustomInputStylesSummary
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 = |