Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid instantiations of Boolean that are immediately unboxed."

Browse Source 
am: 823e05b

* commit '823e05b2db229549c33892a0aa303fd7fb10a214':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e
This commit is contained in:
Tobias Thierer
2016-04-25 09:14:15 +00:00
committed by android-build-merger
parent 9d1357c44e 823e05b2db
commit 71502c44fa
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/notification/ZenModeConfig.java
View File

@@ -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) {

2
core/java/com/android/internal/net/VpnProfile.java
View File

@@ -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];

2
core/java/com/android/internal/util/XmlUtils.java
View File

@@ -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) {

2
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -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)) {

8
services/core/java/com/android/server/content/SyncStorageEngine.java
View File

@@ -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)) {

2
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -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

2
services/core/java/com/android/server/tv/PersistentDataStore.java
View File

@@ -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);
}
}
}

6
telephony/java/android/telephony/ServiceState.java
View File

@@ -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 */

2
telephony/java/android/telephony/SignalStrength.java
View File

@@ -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);
}
/**

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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)));
}