summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-12-20 12:27:55 +0900
committersatok <satok@google.com>2010-12-20 12:30:25 +0900
commit10d2e1bc2f43fa3f39ea819e2eaf14c713c91a27 (patch)
tree0b7ba5a5005aae9162666e211a04ed3990579b85 /src
parentc88a7ff1efd10374974e45768bde1658cc1d8483 (diff)
downloadpackages_apps_Settings-10d2e1bc2f43fa3f39ea819e2eaf14c713c91a27.zip
packages_apps_Settings-10d2e1bc2f43fa3f39ea819e2eaf14c713c91a27.tar.gz
packages_apps_Settings-10d2e1bc2f43fa3f39ea819e2eaf14c713c91a27.tar.bz2
Fix a null pointer exception when disabledSystemIMEs is null.
Bug: 3298244 Change-Id: Ifb3349def052bd50633b0cfe04e5636e22115245
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index 460bc9c..6981927 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -138,6 +138,9 @@ public class InputMethodAndSubtypeUtil {
HashSet<String> set = new HashSet<String>();
String disabledIMEsStr = Settings.Secure.getString(
resolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS);
+ if (TextUtils.isEmpty(disabledIMEsStr)) {
+ return set;
+ }
sStringInputMethodSplitter.setString(disabledIMEsStr);
while(sStringInputMethodSplitter.hasNext()) {
set.add(sStringInputMethodSplitter.next());