summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-29 16:13:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-29 16:13:18 -0800
commitff740d92a72a0cc010452b852896a95dd7d1571b (patch)
tree168614e73bd4a968b5ba16aab41ea0c580deb64e
parent5931c0d66775f9ef4f489ec78644f9df2b35dcaa (diff)
parentb68b35dd6a12b728924e5a7afc64ea58cd242c65 (diff)
downloadpackages_apps_Settings-ff740d92a72a0cc010452b852896a95dd7d1571b.tar.gz
packages_apps_Settings-ff740d92a72a0cc010452b852896a95dd7d1571b.tar.bz2
packages_apps_Settings-ff740d92a72a0cc010452b852896a95dd7d1571b.zip
am b68b35dd: am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"
* commit 'b68b35dd6a12b728924e5a7afc64ea58cd242c65': Possible NumberFormatException of parseInt is outside try-catch
-rw-r--r--src/com/android/settings/SoundSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 4c5fadf51..f5e929065 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -336,8 +336,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements
public boolean onPreferenceChange(Preference preference, Object objValue) {
final String key = preference.getKey();
if (KEY_EMERGENCY_TONE.equals(key)) {
- int value = Integer.parseInt((String) objValue);
try {
+ int value = Integer.parseInt((String) objValue);
Settings.System.putInt(getContentResolver(),
Settings.System.EMERGENCY_TONE, value);
} catch (NumberFormatException e) {