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

[Suggestion] Make suggestion equals and hashcode stable

Browse Source 
Make the equals and hashcode has same result for suggestion create by
builder and get from franework.

Bug: 142035508
Test: atest android.net.wifi

Change-Id: Idbcced87aba940ec0159f892c92a582ab3670da5
This commit is contained in:
Nate Jiang
2020-11-12 15:47:16 -08:00
parent 3e5f65ddcb
commit b63b76abf8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -3255,7 +3255,11 @@ public class WifiConfiguration implements Parcelable {
return key;
}
private String getDefaultSecurityType() {
/**
* Get the default security type string.
* @hide
*/
public String getDefaultSecurityType() {
String key;
if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
key = KeyMgmt.strings[KeyMgmt.WPA_PSK];

11
wifi/java/android/net/wifi/WifiNetworkSuggestion.java
View File

@@ -1180,7 +1180,8 @@ public final class WifiNetworkSuggestion implements Parcelable {
@Override
public int hashCode() {
return Objects.hash(wifiConfiguration.SSID, wifiConfiguration.BSSID,
wifiConfiguration.allowedKeyManagement, wifiConfiguration.getKey(),
wifiConfiguration.getDefaultSecurityType(),
wifiConfiguration.getPasspointUniqueId(),
wifiConfiguration.subscriptionId, wifiConfiguration.carrierId);
}
@@ -1202,10 +1203,10 @@ public final class WifiNetworkSuggestion implements Parcelable {
return TextUtils.equals(this.wifiConfiguration.SSID, lhs.wifiConfiguration.SSID)
&& TextUtils.equals(this.wifiConfiguration.BSSID, lhs.wifiConfiguration.BSSID)
&& Objects.equals(this.wifiConfiguration.allowedKeyManagement,
lhs.wifiConfiguration.allowedKeyManagement)
&& TextUtils.equals(this.wifiConfiguration.getKey(),
lhs.wifiConfiguration.getKey())
&& TextUtils.equals(this.wifiConfiguration.getDefaultSecurityType(),
lhs.wifiConfiguration.getDefaultSecurityType())
&& TextUtils.equals(this.wifiConfiguration.getPasspointUniqueId(),
lhs.wifiConfiguration.getPasspointUniqueId())
&& this.wifiConfiguration.carrierId == lhs.wifiConfiguration.carrierId
&& this.wifiConfiguration.subscriptionId == lhs.wifiConfiguration.subscriptionId;
}