From 722ea032317eb47acc6bcf1cd146576bccbb95c5 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Sat, 14 May 2011 04:30:45 +0900
Subject: [PATCH] Fix NPE in InputMethodAndLanguageSettings

Bug: 4422368

Change-Id: I495eb8de9928922b18b37c6658bd8fd8b4ee3e1a
---
 .../settings/inputmethod/InputMethodAndLanguageSettings.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 611da4f6242..31c68790d6c 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -108,7 +108,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             final int columnIndex = locales.getColumnIndex(UserDictionary.Words.LOCALE);
             do {
                 final String locale = locales.getString(columnIndex);
-                if (!prefs.containsKey(locale))
+                if (locale != null && !prefs.containsKey(locale))
                     prefs.put(locale, createUserDictionaryPreference(locale, activity, ++order));
             } while (locales.moveToNext());
         }