commit 8f1aba2e25837a7737ab463f6580b6238407a635
author Yohei Yukawa <yukawa@google.com> Mon Mar 24 14:21:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 24 14:21:27 2014 +0000
tree 5537e61618066bed12b89cc344b115f65e622a46
parent cf88cf65936962373797d14694011b15d0f4c5f0
parent f1f5ed542d43566f30e9f03f98de9bef717465ce

Merge "Check null before passing to Integer.parseInt"

java/src/com/android/inputmethod/latin/settings/Settings.java

diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 964bf22..1ba92ad 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 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) {