From c60a846e219ead1a40307d1a562013c38ea81b9d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 24 May 2012 16:39:24 +0900
Subject: [PATCH] Fix NPE in Settings.updateCustomInputStylesSummary

Change-Id: I7822adf407046098f97bf60da9382910c0a40209
---
 java/src/com/android/inputmethod/latin/AdditionalSubtype.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 =