Merge "WifiNetworkSelector: Use ScanResultUtil to filter for open networks." into oc-dr1-dev

am: 29702d5f6b

Change-Id: I4685aaeb46613c38375f88b641d68f3f7e784e60

1 files changed, 2 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index 5e9e4ef01..4c1df200a 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -30,6 +30,7 @@ import android.util.Pair;
 
 import com.android.internal.R;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.wifi.util.ScanResultUtil;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -340,9 +341,7 @@ public class WifiNetworkSelector {
         for (ScanDetail scanDetail : mFilteredNetworks) {
             ScanResult scanResult = scanDetail.getScanResult();
 
-            // A capability of [ESS] represents an open access point
-            // that is available for an STA to connect
-            if (scanResult.capabilities == null || !scanResult.capabilities.equals("[ESS]")) {
+            if (!ScanResultUtil.isScanResultForOpenNetwork(scanResult)) {
                 continue;
             }