diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-03-24 07:26:38 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 07:26:38 -0700 |
| commit | 9aa2f8a764280a51d2c74a498681f22dbf02075b (patch) | |
| tree | 5537e61618066bed12b89cc344b115f65e622a46 /java | |
| parent | 683889298e543cb14a0b9ddd54ace53165854659 (diff) | |
| parent | 8f1aba2e25837a7737ab463f6580b6238407a635 (diff) | |
| download | latinime-9aa2f8a764280a51d2c74a498681f22dbf02075b.tar.gz latinime-9aa2f8a764280a51d2c74a498681f22dbf02075b.tar.xz latinime-9aa2f8a764280a51d2c74a498681f22dbf02075b.zip | |
am 8f1aba2e: Merge "Check null before passing to Integer.parseInt"
* commit '8f1aba2e25837a7737ab463f6580b6238407a635':
Check null before passing to Integer.parseInt
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 964bf2246..1ba92adb1 100644 --- 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) { |