1 files changed, 28 insertions, 20 deletions

diff --git a/scanning/scanner_impl.h b/scanning/scanner_impl.h
index 2bb9262..8e1f832 100644
--- a/scanning/scanner_impl.h
+++ b/scanning/scanner_impl.h
@@ -24,7 +24,7 @@
 
 #include "android/net/wifi/BnWifiScannerImpl.h"
 #include "wificond/net/netlink_utils.h"
-#include "wificond/scanning/offload/offload_scan_manager.h"
+#include "wificond/scanning/offload_scan_callback_interface.h"
 #include "wificond/scanning/scan_utils.h"
 
 namespace android {
@@ -32,16 +32,17 @@ namespace wificond {
 
 class ClientInterfaceImpl;
 class OffloadServiceUtils;
+class ScanUtils;
+class OffloadScanCallbackInterfaceImpl;
+class OffloadScanManager;
 
 class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
  public:
-  ScannerImpl(uint32_t wiphy_index,
-              uint32_t interface_index,
+  ScannerImpl(uint32_t wiphy_index, uint32_t interface_index,
               const ScanCapabilities& scan_capabilities,
               const WiphyFeatures& wiphy_features,
               ClientInterfaceImpl* client_interface,
-              NetlinkUtils* netlink_utils,
-              ScanUtils* scan_utils,
+              NetlinkUtils* netlink_utils, ScanUtils* scan_utils,
               std::weak_ptr<OffloadServiceUtils> offload_service_utils);
   ~ScannerImpl();
   // Returns a vector of available frequencies for 2.4GHz channels.
@@ -53,10 +54,15 @@ class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
   // Returns a vector of available frequencies for DFS channels.
   ::android::binder::Status getAvailableDFSChannels(
       ::std::unique_ptr<::std::vector<int32_t>>* out_frequencies) override;
-  // Get the latest scan results from kernel.
+  // Get the latest single scan results from kernel.
   ::android::binder::Status getScanResults(
       std::vector<com::android::server::wifi::wificond::NativeScanResult>*
           out_scan_results) override;
+  // Get the latest pno scan results from the interface that most recently
+  // completed PNO scans
+  ::android::binder::Status getPnoScanResults(
+      std::vector<com::android::server::wifi::wificond::NativeScanResult>*
+          out_scan_results) override;
   ::android::binder::Status scan(
       const ::com::android::server::wifi::wificond::SingleScanSettings&
           scan_settings,
@@ -71,19 +77,19 @@ class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
       const ::android::sp<::android::net::wifi::IScanEvent>& handler) override;
   ::android::binder::Status unsubscribeScanEvents() override;
   ::android::binder::Status subscribePnoScanEvents(
-      const ::android::sp<::android::net::wifi::IPnoScanEvent>& handler) override;
+      const ::android::sp<::android::net::wifi::IPnoScanEvent>& handler)
+      override;
   ::android::binder::Status unsubscribePnoScanEvents() override;
+  void OnOffloadScanResult();
+  void OnOffloadError(
+      OffloadScanCallbackInterface::AsyncErrorReason error_code);
   void Invalidate();
 
  private:
   bool CheckIsValid();
-  void OnOffloadScanResult(
-      std::vector<::com::android::server::wifi::wificond::NativeScanResult>);
-  void OnScanResultsReady(
-      uint32_t interface_index,
-      bool aborted,
-      std::vector<std::vector<uint8_t>>& ssids,
-      std::vector<uint32_t>& frequencies);
+  void OnScanResultsReady(uint32_t interface_index, bool aborted,
+                          std::vector<std::vector<uint8_t>>& ssids,
+                          std::vector<uint32_t>& frequencies);
   void OnSchedScanResultsReady(uint32_t interface_index, bool scan_stopped);
   void LogSsidList(std::vector<std::vector<uint8_t>>& ssid_list,
                    std::string prefix);
@@ -94,11 +100,10 @@ class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
   bool StopPnoScanDefault();
   bool StopPnoScanOffload();
   void ParsePnoSettings(
-    const ::com::android::server::wifi::wificond::PnoSettings& pno_settings,
-    std::vector<std::vector<uint8_t>>* scan_ssids,
-    std::vector<std::vector<uint8_t>>* match_ssids,
-    std::vector<uint32_t>* freqs,
-    std::vector<uint8_t>* match_security);
+      const ::com::android::server::wifi::wificond::PnoSettings& pno_settings,
+      std::vector<std::vector<uint8_t>>* scan_ssids,
+      std::vector<std::vector<uint8_t>>* match_ssids,
+      std::vector<uint32_t>* freqs, std::vector<uint8_t>* match_security);
   SchedScanIntervalSetting GenerateIntervalSetting(
     const ::com::android::server::wifi::wificond::PnoSettings& pno_settings) const;
 
@@ -107,6 +112,9 @@ class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
   bool scan_started_;
   bool pno_scan_started_;
   bool offload_scan_supported_;
+  bool pno_scan_running_over_offload_;
+  bool pno_scan_results_from_offload_;
+  ::com::android::server::wifi::wificond::PnoSettings pno_settings_;
 
   const uint32_t wiphy_index_;
   const uint32_t interface_index_;
@@ -120,7 +128,7 @@ class ScannerImpl : public android::net::wifi::BnWifiScannerImpl {
   ScanUtils* const scan_utils_;
   ::android::sp<::android::net::wifi::IPnoScanEvent> pno_scan_event_handler_;
   ::android::sp<::android::net::wifi::IScanEvent> scan_event_handler_;
-  std::unique_ptr<OffloadScanManager> offload_scan_manager_;
+  std::shared_ptr<OffloadScanManager> offload_scan_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ScannerImpl);
 };