commit d3096132751f44857a182dcdf97bcb7e9ecfca06
author Nate(Qiang) Jiang <qiangjiang@google.com> Thu Feb 13 17:44:53 2020 -0800
committer Nate Jiang <qiangjiang@google.com> Sat Feb 22 15:55:54 2020 +0000
tree 9f685dbfc9e6c9f8de1716aa5223180511cf4378
parent 92fa049dba2291fbe4817b7468b56720cfc8e512

Override hashcode, equals function for PnoNetwork

Bug: 148535554
Test: atest android.net.wifi
Change-Id: I9f6ea75966b97ac67234b73a8198492a8edfacb2

framework/java/android/net/wifi/WifiScanner.java

diff --git a/framework/java/android/net/wifi/WifiScanner.java b/framework/java/android/net/wifi/WifiScanner.java
index b4eb30b..5e48919 100644
--- a/framework/java/android/net/wifi/WifiScanner.java
+++ b/framework/java/android/net/wifi/WifiScanner.java
@@ -36,6 +36,7 @@
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.WorkSource;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -744,6 +745,25 @@
             public PnoNetwork(String ssid) {
                 this.ssid = ssid;
             }
+
+            @Override
+            public int hashCode() {
+                return Objects.hash(ssid, flags, authBitField);
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                if (this == obj) {
+                    return true;
+                }
+                if (!(obj instanceof PnoNetwork)) {
+                    return false;
+                }
+                PnoNetwork lhs = (PnoNetwork) obj;
+                return TextUtils.equals(this.ssid, lhs.ssid)
+                        && this.flags == lhs.flags
+                        && this.authBitField == lhs.authBitField;
+            }
         }
 
         /** Connected vs Disconnected PNO flag {@hide} */