Merge "Check null before passing to Integer.parseInt"

2014-03-24 14:21:26 +00:00 · 2014-03-24 14:21:26 +00:00 · 8f1aba2e25
parent cf88cf6593 f1f5ed542d
commit 8f1aba2e25
1 changed files with 3 additions and 0 deletions
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@ -273,6 +273,9 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
    public static int readKeyboardThemeIndex(final SharedPreferences prefs, final Resources res) {
        final int defaultThemeIndex = readDefaultKeyboardThemeIndex(res);
        final String themeIndexString = prefs.getString(PREF_KEYBOARD_LAYOUT, null);
+        if (themeIndexString == null) {
+            return defaultThemeIndex;
+        }
        try {
            return Integer.parseInt(themeIndexString);
        } catch (final NumberFormatException e) {