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

Commit 55078c4f authored by Peter Qiu's avatar Peter Qiu
Browse files

hotspot2: enclose conditional statement in parenthesis 

Couple unit tests are failing due to conditional statements
not enclosed in the parenthesis, which causes unexpected
returned value for the equals function.  So fix it.

Bug: 34764955
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Iaf0151803cb62eb8af308e5de40558617f84cd2f
parent a7ce4609

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

    }



    /**