diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-03-24 20:45:37 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-03-24 20:54:03 +0900 |
| commit | f1f5ed542d43566f30e9f03f98de9bef717465ce (patch) | |
| tree | 234ca8cd14132297511352d0a6c3bcce7942f36e /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | a17195224b132563055bef762fda0f0d6840adcf (diff) | |
| download | latinime-f1f5ed542d43566f30e9f03f98de9bef717465ce.tar.gz latinime-f1f5ed542d43566f30e9f03f98de9bef717465ce.tar.xz latinime-f1f5ed542d43566f30e9f03f98de9bef717465ce.zip | |
Check null before passing to Integer.parseInt
Just after user data is cleared, user preference associated with
PREF_KEYBOARD_LAYOUT is always empty. In such case, we might
want to return the default value immediately, rather than
calling Integer.parseInt(null) and catching NumberFormatException
unnecessarily.
BUG: 13472379
Change-Id: I8dca9a22780d057013c032bd1f56e730dcada3ce
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/Settings.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) { |