Tidy up uses of Integer.valueOf.
Use parseInt when the result is assigned to an int. Allocates fewer
objects.
bug: 28078871
Change-Id: Ibfe289b772678fddb22f043b555c7bb28b70e4fa
diff --git a/src/com/android/phone/CdmaSubscriptionListPreference.java b/src/com/android/phone/CdmaSubscriptionListPreference.java
index 9b96850..20adc12 100644
--- a/src/com/android/phone/CdmaSubscriptionListPreference.java
+++ b/src/com/android/phone/CdmaSubscriptionListPreference.java
@@ -79,7 +79,7 @@
return;
}
- int buttonCdmaSubscriptionMode = Integer.valueOf(getValue()).intValue();
+ int buttonCdmaSubscriptionMode = Integer.parseInt(getValue());
Log.d(LOG_TAG, "Setting new value " + buttonCdmaSubscriptionMode);
int statusCdmaSubscriptionMode;
switch(buttonCdmaSubscriptionMode) {
@@ -120,7 +120,7 @@
if (ar.exception == null) {
// Get the original string entered by the user
- int cdmaSubscriptionMode = Integer.valueOf((String) ar.userObj).intValue();
+ int cdmaSubscriptionMode = Integer.parseInt((String) ar.userObj);
Settings.Global.putInt(mPhone.getContext().getContentResolver(),
Settings.Global.CDMA_SUBSCRIPTION_MODE,
cdmaSubscriptionMode );
diff --git a/src/com/android/phone/CdmaSystemSelectListPreference.java b/src/com/android/phone/CdmaSystemSelectListPreference.java
index 5a001de..9bc55bd 100644
--- a/src/com/android/phone/CdmaSystemSelectListPreference.java
+++ b/src/com/android/phone/CdmaSystemSelectListPreference.java
@@ -67,7 +67,7 @@
super.onDialogClosed(positiveResult);
if (positiveResult && (getValue() != null)) {
- int buttonCdmaRoamingMode = Integer.valueOf(getValue()).intValue();
+ int buttonCdmaRoamingMode = Integer.parseInt(getValue());
int settingsCdmaRoamingMode =
Settings.Global.getInt(mPhone.getContext().getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE, Phone.CDMA_RM_HOME);
@@ -147,7 +147,7 @@
AsyncResult ar = (AsyncResult) msg.obj;
if ((ar.exception == null) && (getValue() != null)) {
- int cdmaRoamingMode = Integer.valueOf(getValue()).intValue();
+ int cdmaRoamingMode = Integer.parseInt(getValue());
Settings.Global.putInt(mPhone.getContext().getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE,
cdmaRoamingMode );
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index bf0ace3..404c976 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -814,7 +814,7 @@
//Check if the button value is changed from the System.Setting
mButtonPreferredNetworkMode.setValue((String) objValue);
int buttonNetworkMode;
- buttonNetworkMode = Integer.valueOf((String) objValue).intValue();
+ buttonNetworkMode = Integer.parseInt((String) objValue);
int settingsNetworkMode = android.provider.Settings.Global.getInt(
mPhone.getContext().getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
@@ -864,7 +864,7 @@
} else if (preference == mButtonEnabledNetworks) {
mButtonEnabledNetworks.setValue((String) objValue);
int buttonNetworkMode;
- buttonNetworkMode = Integer.valueOf((String) objValue).intValue();
+ buttonNetworkMode = Integer.parseInt((String) objValue);
if (DBG) log("buttonNetworkMode: " + buttonNetworkMode);
int settingsNetworkMode = android.provider.Settings.Global.getInt(
mPhone.getContext().getContentResolver(),
@@ -963,15 +963,13 @@
if (ar.exception == null) {
int networkMode;
if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null) {
- networkMode = Integer.valueOf(
- mButtonPreferredNetworkMode.getValue()).intValue();
+ networkMode = Integer.parseInt(mButtonPreferredNetworkMode.getValue());
android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
networkMode );
}
if (getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null) {
- networkMode = Integer.valueOf(
- mButtonEnabledNetworks.getValue()).intValue();
+ networkMode = Integer.parseInt(mButtonEnabledNetworks.getValue());
android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
networkMode );
diff --git a/src/com/android/phone/settings/TtyModeListPreference.java b/src/com/android/phone/settings/TtyModeListPreference.java
index e8ef099..89cac47 100644
--- a/src/com/android/phone/settings/TtyModeListPreference.java
+++ b/src/com/android/phone/settings/TtyModeListPreference.java
@@ -51,8 +51,7 @@
@Override
public boolean onPreferenceChange(Preference preference, Object objValue) {
if (preference == this) {
- int buttonTtyMode;
- buttonTtyMode = Integer.valueOf((String) objValue).intValue();
+ int buttonTtyMode = Integer.parseInt((String) objValue);
int settingsTtyMode = android.provider.Settings.Secure.getInt(
getContext().getContentResolver(),
Settings.Secure.PREFERRED_TTY_MODE,