commit ca99cb71eab502037120cdf68f854c882fcd9e57
author The Android Open Source Project <initial-contribution@android.com> Fri Nov 22 10:35:36 2013 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Nov 22 10:35:36 2013 -0800
tree 81b375f7b0af6f1bce4e5602db8bcb8a65aebeac
parent 98f5e1861da4d708e7199b5d563895cf4d2c8db7
parent bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e

Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index c379ec3..813923d 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -71,7 +71,7 @@
     private CheckBoxPreference mNotificationPulse;
 
     private final Configuration mCurConfig = new Configuration();
-    
+
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
 
@@ -226,7 +226,7 @@
         }
         return indices.length-1;
     }
-    
+
     public void readFontSizePreference(ListPreference pref) {
         try {
             mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
@@ -244,7 +244,7 @@
         pref.setSummary(String.format(res.getString(R.string.summary_font_size),
                 fontSizeNames[index]));
     }
-    
+
     @Override
     public void onResume() {
         super.onResume();
@@ -350,8 +350,8 @@
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         final String key = preference.getKey();
         if (KEY_SCREEN_TIMEOUT.equals(key)) {
-            int value = Integer.parseInt((String) objValue);
             try {
+                int value = Integer.parseInt((String) objValue);
                 Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
                 updateTimeoutPreferenceDescription(value);
             } catch (NumberFormatException e) {