From ca0182073530a237babe65b9ec7a9b41e667f8d1 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Thu, 21 Apr 2016 17:51:41 +0100 Subject: [PATCH] Avoid instantiations of Boolean that are immediately unboxed. Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base (not including Am.java, which I'm leaving for a separate change). Also fixed a couple of other valueOf()s in SyncStorageEngine. Bug: 28289401 Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc --- core/java/android/service/notification/ZenModeConfig.java | 2 +- core/java/com/android/internal/net/VpnProfile.java | 2 +- core/java/com/android/internal/util/XmlUtils.java | 2 +- .../core/java/com/android/server/am/ActivityRecord.java | 2 +- .../com/android/server/content/SyncStorageEngine.java | 8 ++++---- .../com/android/server/notification/RankingHelper.java | 2 +- .../java/com/android/server/tv/PersistentDataStore.java | 2 +- telephony/java/android/telephony/ServiceState.java | 6 +++--- telephony/java/android/telephony/SignalStrength.java | 2 +- telephony/java/android/telephony/TelephonyManager.java | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 6da9019810332..30766fbb8ba27 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -534,7 +534,7 @@ public class ZenModeConfig implements Parcelable { private static boolean safeBoolean(XmlPullParser parser, String att, boolean defValue) { final String val = parser.getAttributeValue(null, att); if (TextUtils.isEmpty(val)) return defValue; - return Boolean.valueOf(val); + return Boolean.parseBoolean(val); } private static int safeInt(XmlPullParser parser, String att, int defValue) { diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java index 01349bb1f7f4a..ada8803acc427 100644 --- a/core/java/com/android/internal/net/VpnProfile.java +++ b/core/java/com/android/internal/net/VpnProfile.java @@ -135,7 +135,7 @@ public class VpnProfile implements Cloneable, Parcelable { profile.dnsServers = values[5]; profile.searchDomains = values[6]; profile.routes = values[7]; - profile.mppe = Boolean.valueOf(values[8]); + profile.mppe = Boolean.parseBoolean(values[8]); profile.l2tpSecret = values[9]; profile.ipsecIdentifier = values[10]; profile.ipsecSecret = values[11]; diff --git a/core/java/com/android/internal/util/XmlUtils.java b/core/java/com/android/internal/util/XmlUtils.java index 6393fbae7180d..992cb4e51f0f3 100644 --- a/core/java/com/android/internal/util/XmlUtils.java +++ b/core/java/com/android/internal/util/XmlUtils.java @@ -1280,7 +1280,7 @@ public class XmlUtils { if (eventType == parser.START_TAG) { if (parser.getName().equals("item")) { try { - array[i] = Boolean.valueOf(parser.getAttributeValue(null, "value")); + array[i] = Boolean.parseBoolean(parser.getAttributeValue(null, "value")); } catch (NullPointerException e) { throw new XmlPullParserException("Need value attribute in item"); } catch (NumberFormatException e) { diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 7d63e8d2f4cea..a80ae36875afe 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -1218,7 +1218,7 @@ final class ActivityRecord { } else if (ATTR_RESOLVEDTYPE.equals(attrName)) { resolvedType = attrValue; } else if (ATTR_COMPONENTSPECIFIED.equals(attrName)) { - componentSpecified = Boolean.valueOf(attrValue); + componentSpecified = Boolean.parseBoolean(attrValue); } else if (ATTR_USERID.equals(attrName)) { userId = Integer.valueOf(attrValue); } else if (attrName.startsWith(TaskDescription.ATTR_TASKDESCRIPTION_PREFIX)) { diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java index cca0c16f805fd..ddd0f0cd7366a 100644 --- a/services/core/java/com/android/server/content/SyncStorageEngine.java +++ b/services/core/java/com/android/server/content/SyncStorageEngine.java @@ -2501,13 +2501,13 @@ public class SyncStorageEngine extends Handler { Log.w(TAG, "Unknown pending operation version " + versionString); throw new java.io.IOException("Unknown version."); } - int authorityId = Integer.valueOf(parser.getAttributeValue( + int authorityId = Integer.parseInt(parser.getAttributeValue( null, XML_ATTR_AUTHORITYID)); - boolean expedited = Boolean.valueOf(parser.getAttributeValue( + boolean expedited = Boolean.parseBoolean(parser.getAttributeValue( null, XML_ATTR_EXPEDITED)); - int syncSource = Integer.valueOf(parser.getAttributeValue( + int syncSource = Integer.parseInt(parser.getAttributeValue( null, XML_ATTR_SOURCE)); - int reason = Integer.valueOf(parser.getAttributeValue( + int reason = Integer.parseInt(parser.getAttributeValue( null, XML_ATTR_REASON)); AuthorityInfo authority = mAuthorities.get(authorityId); if (Log.isLoggable(TAG_FILE, Log.VERBOSE)) { diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index a089518c53b8c..5849730151a8f 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -326,7 +326,7 @@ public class RankingHelper implements RankingConfig { private static boolean tryParseBool(String value, boolean defValue) { if (TextUtils.isEmpty(value)) return defValue; - return Boolean.valueOf(value); + return Boolean.parseBoolean(value); } @Override diff --git a/services/core/java/com/android/server/tv/PersistentDataStore.java b/services/core/java/com/android/server/tv/PersistentDataStore.java index f6b17059b9349..85a8829605756 100644 --- a/services/core/java/com/android/server/tv/PersistentDataStore.java +++ b/services/core/java/com/android/server/tv/PersistentDataStore.java @@ -251,7 +251,7 @@ final class PersistentDataStore { throw new XmlPullParserException( "Missing " + ATTR_ENABLED + " attribute on " + TAG_PARENTAL_CONTROLS); } - mParentalControlsEnabled = Boolean.valueOf(enabled); + mParentalControlsEnabled = Boolean.parseBoolean(enabled); } } } diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 13374879f09b9..b5420db0f8191 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -986,7 +986,7 @@ public class ServiceState implements Parcelable { m.putString("data-operator-alpha-long", mDataOperatorAlphaLong); m.putString("data-operator-alpha-short", mDataOperatorAlphaShort); m.putString("data-operator-numeric", mDataOperatorNumeric); - m.putBoolean("manual", Boolean.valueOf(mIsManualNetworkSelection)); + m.putBoolean("manual", mIsManualNetworkSelection); m.putInt("radioTechnology", mRilVoiceRadioTechnology); m.putInt("dataRadioTechnology", mRilDataRadioTechnology); m.putBoolean("cssIndicator", mCssIndicator); @@ -994,8 +994,8 @@ public class ServiceState implements Parcelable { m.putInt("systemId", mSystemId); m.putInt("cdmaRoamingIndicator", mCdmaRoamingIndicator); m.putInt("cdmaDefaultRoamingIndicator", mCdmaDefaultRoamingIndicator); - m.putBoolean("emergencyOnly", Boolean.valueOf(mIsEmergencyOnly)); - m.putBoolean("isDataRoamingFromRegistration", Boolean.valueOf(mIsDataRoamingFromRegistration)); + m.putBoolean("emergencyOnly", mIsEmergencyOnly); + m.putBoolean("isDataRoamingFromRegistration", mIsDataRoamingFromRegistration); } /** @hide */ diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index fced6670f6a3e..e87cba1374838 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -1046,7 +1046,7 @@ public class SignalStrength implements Parcelable { m.putInt("LteRssnr", mLteRssnr); m.putInt("LteCqi", mLteCqi); m.putInt("TdScdma", mTdScdmaRscp); - m.putBoolean("isGsm", Boolean.valueOf(isGsm)); + m.putBoolean("isGsm", isGsm); } /** diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 727698037929f..5777976cce31d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4636,7 +4636,7 @@ public class TelephonyManager { */ public boolean getSmsReceiveCapableForPhone(int phoneId, boolean defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { - return Boolean.valueOf(TelephonyManager.getTelephonyProperty(phoneId, + return Boolean.parseBoolean(TelephonyManager.getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SMS_RECEIVE, String.valueOf(defaultValue))); } @@ -4667,7 +4667,7 @@ public class TelephonyManager { */ public boolean getSmsSendCapableForPhone(int phoneId, boolean defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { - return Boolean.valueOf(TelephonyManager.getTelephonyProperty(phoneId, + return Boolean.parseBoolean(TelephonyManager.getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SMS_SEND, String.valueOf(defaultValue))); }