From 55078c4fa85896b395e7500b179ef60af1992c55 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Mon, 30 Jan 2017 17:47:53 -0800 Subject: 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 --- .../android/net/wifi/hotspot2/PasspointConfiguration.java | 6 +++--- wifi/java/android/net/wifi/hotspot2/pps/Policy.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index ca4d12141871..f1174b677dcd 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -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 diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java index b2583d324420..bc294025c142 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -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)); } /** -- cgit v1.2.3-59-g8ed1b