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

Commit 1f46283d authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b0... 

Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b0 am: ea146326 am: 77095c33
am: e7e2dc14

Change-Id: Ib6a5a5bac5886099581e7027af74e90fa98eb35f
parents 6b1c99fe e7e2dc14

wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java

+3 −3
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ public final class PasspointConfiguration implements Parcelable { 
        return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp))

                && (credential == null ? that.credential == null

                        : credential.equals(that.credential))

                && (policy == null) ? that.policy == null : policy.equals(that.policy)

                && (subscriptionUpdate == null) ? that.subscriptionUpdate == null

                        : subscriptionUpdate.equals(that.subscriptionUpdate)

                && (policy == null ? that.policy == null : policy.equals(that.policy))

                && (subscriptionUpdate == null ? that.subscriptionUpdate == null

                        : subscriptionUpdate.equals(that.subscriptionUpdate))

                && isTrustRootCertListEquals(trustRootCertList, that.trustRootCertList)

                && updateIdentifier == that.updateIdentifier

                && credentialPriority == that.credentialPriority

wifi/java/android/net/wifi/hotspot2/pps/Policy.java

+6 −6
Original line number Diff line number Diff line
@@ -293,13 +293,13 @@ public final class Policy implements Parcelable { 
                && minRoamingDownlinkBandwidth == that.minRoamingDownlinkBandwidth

                && minRoamingUplinkBandwidth == that.minRoamingUplinkBandwidth

                && Arrays.equals(excludedSsidList, that.excludedSsidList)

                && (requiredProtoPortMap == null) ? that.requiredProtoPortMap == null

                        : requiredProtoPortMap.equals(that.requiredProtoPortMap)

                && (requiredProtoPortMap == null ? that.requiredProtoPortMap == null

                        : requiredProtoPortMap.equals(that.requiredProtoPortMap))

                && maximumBssLoadValue == that.maximumBssLoadValue

                && (preferredRoamingPartnerList == null) ? that.preferredRoamingPartnerList == null

                        : preferredRoamingPartnerList.equals(that.preferredRoamingPartnerList)

                && (policyUpdate == null) ? that.policyUpdate == null

                        : policyUpdate.equals(that.policyUpdate);

                && (preferredRoamingPartnerList == null ? that.preferredRoamingPartnerList == null

                        : preferredRoamingPartnerList.equals(that.preferredRoamingPartnerList))

                && (policyUpdate == null ? that.policyUpdate == null

                        : policyUpdate.equals(that.policyUpdate));

    }



    /**