Pno frequency culling: plumb freq to wificond

Add int[] frequecies to PnoNetwork data structure and add the pipeline
to do the plumbing down to wificond.

Bug: 64312268
Test: compile, unit test

Manual test:
flash to device
connect to AP in shield box
close shield box
screen off to trigger pno scan
observe pno scan started and no crashes
open shield box
wait for connection to occur

Change-Id: I4ebaf7f034e5a4d0f50582bd469460b3ec00d761

3 files changed, 19 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java
index 1a9f6b3dd..42eccfe8b 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java
@@ -127,6 +127,8 @@ public class WifiNativeTest {
             }};
     private static final String TEST_QUOTED_SSID_1 = "\"testSsid1\"";
     private static final String TEST_QUOTED_SSID_2 = "\"testSsid2\"";
+    private static final int[] TEST_FREQUENCIES_1 = {};
+    private static final int[] TEST_FREQUENCIES_2 = {2500, 5124};
     private static final Set<String> SCAN_HIDDEN_NETWORK_SSID_SET =
             new HashSet<String>() {{
                 add(TEST_QUOTED_SSID_1);
@@ -142,6 +144,8 @@ public class WifiNativeTest {
                 networkList[1] = new WifiNative.PnoNetwork();
                 networkList[0].ssid = TEST_QUOTED_SSID_1;
                 networkList[1].ssid = TEST_QUOTED_SSID_2;
+                networkList[0].frequencies = TEST_FREQUENCIES_1;
+                networkList[1].frequencies = TEST_FREQUENCIES_2;
             }};
     private static final MacAddress TEST_MAC_ADDRESS = MacAddress.fromString("ee:33:a2:94:10:92");
 
@@ -218,11 +222,13 @@ public class WifiNativeTest {
         pnoNet1.ssid = new String("sametext");
         pnoNet1.flags = 2;
         pnoNet1.auth_bit_field = 4;
+        pnoNet1.frequencies = TEST_FREQUENCIES_2;
 
         WifiNative.PnoNetwork pnoNet2 = new WifiNative.PnoNetwork();
         pnoNet2.ssid = new String("sametext");
         pnoNet2.flags = 2;
         pnoNet2.auth_bit_field = 4;
+        pnoNet2.frequencies = TEST_FREQUENCIES_2;
 
         assertTrue(pnoNet1.equals(pnoNet2));
         assertEquals(pnoNet1.hashCode(), pnoNet2.hashCode());
diff --git a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
index 76388446d..7433beca8 100644
--- a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
@@ -56,6 +56,7 @@ import org.mockito.MockitoAnnotations;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.HashSet;
 import java.util.List;
@@ -142,6 +143,8 @@ public class WificondControlTest {
             }};
     private static final String TEST_QUOTED_SSID_1 = "\"testSsid1\"";
     private static final String TEST_QUOTED_SSID_2 = "\"testSsid2\"";
+    private static final int[] TEST_FREQUENCIES_1 = {};
+    private static final int[] TEST_FREQUENCIES_2 = {2500, 5124};
 
     private static final Set<String> SCAN_HIDDEN_NETWORK_SSID_SET =
             new HashSet<String>() {{
@@ -159,8 +162,10 @@ public class WificondControlTest {
                 networkList[1] = new WifiNative.PnoNetwork();
                 networkList[0].ssid = TEST_QUOTED_SSID_1;
                 networkList[0].flags = WifiScanner.PnoSettings.PnoNetwork.FLAG_DIRECTED_SCAN;
+                networkList[0].frequencies = TEST_FREQUENCIES_1;
                 networkList[1].ssid = TEST_QUOTED_SSID_2;
                 networkList[1].flags = 0;
+                networkList[1].frequencies = TEST_FREQUENCIES_2;
             }};
     private static final MacAddress TEST_MAC_ADDRESS = MacAddress.fromString("ee:33:a2:94:10:92");
 
@@ -1029,7 +1034,10 @@ public class WificondControlTest {
                 if (isNetworkHidden != settings.pnoNetworks.get(i).isHidden) {
                     return false;
                 }
-
+                if (!Arrays.equals(mExpectedPnoSettings.networkList[i].frequencies,
+                        settings.pnoNetworks.get(i).frequencies)) {
+                    return false;
+                }
             }
             return true;
         }
diff --git a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
index 3fd9c6024..abc266513 100644
--- a/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/wificond/PnoSettingsTest.java
@@ -37,6 +37,8 @@ public class PnoSettingsTest {
             new byte[] {'G', 'o', 'o', 'g', 'l', 'e', 'G', 'u', 'e', 's', 't'};
     private static final byte[] TEST_SSID_2 =
             new byte[] {'A', 'n', 'd', 'r', 'o', 'i', 'd', 'T', 'e', 's', 't'};
+    private static final int[] TEST_FREQUENCIES_1 = {};
+    private static final int[] TEST_FREQUENCIES_2 = {2500, 5124};
     private static final int TEST_INTERVAL_MS = 30000;
     private static final int TEST_MIN_2G_RSSI = -60;
     private static final int TEST_MIN_5G_RSSI = -65;
@@ -53,10 +55,12 @@ public class PnoSettingsTest {
         PnoNetwork pnoNetwork1 = new PnoNetwork();
         pnoNetwork1.ssid = TEST_SSID_1;
         pnoNetwork1.isHidden = true;
+        pnoNetwork1.frequencies = TEST_FREQUENCIES_1;
 
         PnoNetwork pnoNetwork2 = new PnoNetwork();
         pnoNetwork2.ssid = TEST_SSID_2;
         pnoNetwork2.isHidden = false;
+        pnoNetwork2.frequencies = TEST_FREQUENCIES_2;
 
         pnoSettings.pnoNetworks = new ArrayList(Arrays.asList(pnoNetwork1, pnoNetwork2));