From 7e7769989589df86ec970a87dff7fdd160f9ccb2 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Fri, 1 Nov 2013 17:39:44 +0900 Subject: [PATCH] Move a line into try block Currently, NumberFormatException is never handled as Integer.parseInt() is called outside try block. This moves that line inside try block. Change-Id: I54544f5a665ca0f821de5351001755cb965078dc Signed-off-by: Shuhrat Dehkanov --- src/com/android/settings/DisplaySettings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index fb839a716ad..e59b0bff655 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -71,7 +71,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private CheckBoxPreference mNotificationPulse; private final Configuration mCurConfig = new Configuration(); - + private ListPreference mScreenTimeoutPreference; private Preference mScreenSaverPreference; @@ -107,7 +107,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements com.android.internal.R.bool.config_dreamsSupported) == false) { getPreferenceScreen().removePreference(mScreenSaverPreference); } - + mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT); final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE); @@ -219,7 +219,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } return indices.length-1; } - + public void readFontSizePreference(ListPreference pref) { try { mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration()); @@ -237,7 +237,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements pref.setSummary(String.format(res.getString(R.string.summary_font_size), fontSizeNames[index])); } - + @Override public void onResume() { super.onResume(); @@ -343,8 +343,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 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) {