Merge "Fix a null pointer exception when disabledSystemIMEs is null."

This commit is contained in:
satok
2010-12-19 19:35:00 -08:00
committed by Android (Google) Code Review

View File

@@ -138,6 +138,9 @@ public class InputMethodAndSubtypeUtil {
HashSet<String> set = new HashSet<String>(); HashSet<String> set = new HashSet<String>();
String disabledIMEsStr = Settings.Secure.getString( String disabledIMEsStr = Settings.Secure.getString(
resolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS); resolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS);
if (TextUtils.isEmpty(disabledIMEsStr)) {
return set;
}
sStringInputMethodSplitter.setString(disabledIMEsStr); sStringInputMethodSplitter.setString(disabledIMEsStr);
while(sStringInputMethodSplitter.hasNext()) { while(sStringInputMethodSplitter.hasNext()) {
set.add(sStringInputMethodSplitter.next()); set.add(sStringInputMethodSplitter.next());