Skip to content
Snippets Groups Projects
Commit c60a846e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix NPE in Settings.updateCustomInputStylesSummary

Change-Id: I7822adf407046098f97bf60da9382910c0a40209
parent 1e1235fe
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ import android.view.inputmethod.InputMethodSubtype; ...@@ -28,6 +28,7 @@ import android.view.inputmethod.InputMethodSubtype;
import java.util.ArrayList; import java.util.ArrayList;
public class AdditionalSubtype { public class AdditionalSubtype {
private static final InputMethodSubtype EMPTY_SUBTYPE_ARRAY = new InputMethodSubtype[0];
private AdditionalSubtype() { private AdditionalSubtype() {
// This utility class is not publicly instantiable. // This utility class is not publicly instantiable.
...@@ -86,7 +87,7 @@ public class AdditionalSubtype { ...@@ -86,7 +87,7 @@ public class AdditionalSubtype {
public static InputMethodSubtype[] createAdditionalSubtypesArray(String prefSubtypes) { public static InputMethodSubtype[] createAdditionalSubtypesArray(String prefSubtypes) {
if (TextUtils.isEmpty(prefSubtypes)) { if (TextUtils.isEmpty(prefSubtypes)) {
return null; return EMPTY_SUBTYPE_ARRAY;
} }
final String[] prefSubtypeArray = prefSubtypes.split(PREF_SUBTYPE_SEPARATOR); final String[] prefSubtypeArray = prefSubtypes.split(PREF_SUBTYPE_SEPARATOR);
final ArrayList<InputMethodSubtype> subtypesList = final ArrayList<InputMethodSubtype> subtypesList =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment