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

Merge "hotspot2: enclose conditional statement in parenthesis"

Browse Source 
am: 161ac8b006

Change-Id: I2da11aee68e52f9e868ca23cbd913703ef0585e3
This commit is contained in:
Peter Qiu
2017-01-31 18:21:27 +00:00
committed by android-build-merger
parent 60e1375f79 161ac8b006
commit ea14632665
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java
View File

@@ -217,9 +217,9 @@ public final class PasspointConfiguration implements Parcelable {
return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp)) return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp))
&& (credential == null ? that.credential == null && (credential == null ? that.credential == null
: credential.equals(that.credential)) : credential.equals(that.credential))
&& (policy == null) ? that.policy == null : policy.equals(that.policy) && (policy == null ? that.policy == null : policy.equals(that.policy))
&& (subscriptionUpdate == null) ? that.subscriptionUpdate == null && (subscriptionUpdate == null ? that.subscriptionUpdate == null
: subscriptionUpdate.equals(that.subscriptionUpdate) : subscriptionUpdate.equals(that.subscriptionUpdate))
&& isTrustRootCertListEquals(trustRootCertList, that.trustRootCertList) && isTrustRootCertListEquals(trustRootCertList, that.trustRootCertList)
&& updateIdentifier == that.updateIdentifier && updateIdentifier == that.updateIdentifier
&& credentialPriority == that.credentialPriority && credentialPriority == that.credentialPriority

12
wifi/java/android/net/wifi/hotspot2/pps/Policy.java
View File

@@ -293,13 +293,13 @@ public final class Policy implements Parcelable {
&& minRoamingDownlinkBandwidth == that.minRoamingDownlinkBandwidth && minRoamingDownlinkBandwidth == that.minRoamingDownlinkBandwidth
&& minRoamingUplinkBandwidth == that.minRoamingUplinkBandwidth && minRoamingUplinkBandwidth == that.minRoamingUplinkBandwidth
&& Arrays.equals(excludedSsidList, that.excludedSsidList) && Arrays.equals(excludedSsidList, that.excludedSsidList)
&& (requiredProtoPortMap == null) ? that.requiredProtoPortMap == null && (requiredProtoPortMap == null ? that.requiredProtoPortMap == null
: requiredProtoPortMap.equals(that.requiredProtoPortMap) : requiredProtoPortMap.equals(that.requiredProtoPortMap))
&& maximumBssLoadValue == that.maximumBssLoadValue && maximumBssLoadValue == that.maximumBssLoadValue
&& (preferredRoamingPartnerList == null) ? that.preferredRoamingPartnerList == null && (preferredRoamingPartnerList == null ? that.preferredRoamingPartnerList == null
: preferredRoamingPartnerList.equals(that.preferredRoamingPartnerList) : preferredRoamingPartnerList.equals(that.preferredRoamingPartnerList))
&& (policyUpdate == null) ? that.policyUpdate == null && (policyUpdate == null ? that.policyUpdate == null
: policyUpdate.equals(that.policyUpdate); : policyUpdate.equals(that.policyUpdate));
} }
/** /**