am 98f5e186: am c3a6cd6e: Merge "Move a line into try block"

* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
  Move a line into try block
This commit is contained in:
Elliott Hughes
2013-11-05 10:35:25 -08:00
committed by Android Git Automerger

View File

@@ -350,8 +350,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
public boolean onPreferenceChange(Preference preference, Object objValue) { public boolean onPreferenceChange(Preference preference, Object objValue) {
final String key = preference.getKey(); final String key = preference.getKey();
if (KEY_SCREEN_TIMEOUT.equals(key)) { if (KEY_SCREEN_TIMEOUT.equals(key)) {
int value = Integer.parseInt((String) objValue);
try { try {
int value = Integer.parseInt((String) objValue);
Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value); Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
updateTimeoutPreferenceDescription(value); updateTimeoutPreferenceDescription(value);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {