Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71502c44 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

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

am: 823e05b2

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

Change-Id: I170bf470d63faec93c228ae897796a2e6067da7e
parents 9d1357c4 823e05b2

core/java/android/service/notification/ZenModeConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

core/java/com/android/internal/net/VpnProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -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];

core/java/com/android/internal/util/XmlUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

services/core/java/com/android/server/am/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

services/core/java/com/android/server/content/SyncStorageEngine.java

+4 −4
Original line number Diff line number Diff line
@@ -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)) {