Add netlink helper function to request a full scan

Bug: 33251936
Test: compile, unit tests, and manual test
Change-Id: I724adc9cd3a3a439f3d4ccbfb389e6752b6dc2d6

diff --git a/scanning/scan_utils.cpp b/scanning/scan_utils.cpp
index 38ec54a..081ed65 100644 (file)
--- a/scanning/scan_utils.cpp
+++ b/scanning/scan_utils.cpp
@@ -213,6 +213,12 @@ bool ScanUtils::GetSSIDFromInfoElement(const vector<uint8_t>& ie,
   return false;
 }
 
+bool ScanUtils::StartFullScan(uint32_t interface_index) {
+  // Using empty SSID for a wildcard scan.
+  vector<vector<uint8_t>> ssids{vector<uint8_t>{0}};
+  return Scan(interface_index, ssids, vector<uint32_t>());
+}
+
 bool ScanUtils::Scan(uint32_t interface_index,
                      const vector<vector<uint8_t>>& ssids,
                      const vector<uint32_t>& freqs) {

diff --git a/scanning/scan_utils.h b/scanning/scan_utils.h
index 1fa63af..5a865ea 100644 (file)
--- a/scanning/scan_utils.h
+++ b/scanning/scan_utils.h
@@ -58,6 +58,11 @@ class ScanUtils {
       uint32_t interface_index,
       std::vector<::com::android::server::wifi::wificond::NativeScanResult>* out_scan_results);
 
+  // Start a full scan on interface with index |interface_index|.
+  // This will scan for all ssids and frequencies.
+  // Returns true on success.
+  virtual bool StartFullScan(uint32_t interface_index);
+
   // Send scan request to kernel for interface with index |interface_index|.
   // |ssids| is a vector of ssids we request to scan, which mostly is used
   // for hidden networks.

diff --git a/tests/mock_scan_utils.h b/tests/mock_scan_utils.h
index dbe3b85..ab4a64b 100644 (file)
--- a/tests/mock_scan_utils.h
+++ b/tests/mock_scan_utils.h
@@ -29,6 +29,9 @@ class MockScanUtils : public ScanUtils {
   MockScanUtils(NetlinkManager* netlink_manager);
   ~MockScanUtils() override = default;
 
+  MOCK_METHOD1(StartFullScan, bool(
+      uint32_t interface_index));
+
   MOCK_METHOD2(GetScanResult, bool(
       uint32_t interface_index,
       std::vector<::com::android::server::wifi::wificond::NativeScanResult>* out_scan_results));