Merge Android RHEADmaster

Bug: 168057903
Merged-In: I3b0a326c6381091e8721811fb5ea352e6af1031f
Change-Id: Id8a690a46c023b26372220ab8878b86b2b881eeb

1 files changed, 8 insertions, 9 deletions

diff --git a/scanning/scan_utils.h b/scanning/scan_utils.h
index d160123..bc190c6 100644
--- a/scanning/scan_utils.h
+++ b/scanning/scan_utils.h
@@ -24,20 +24,18 @@
 
 #include "wificond/net/netlink_manager.h"
 
-namespace com {
 namespace android {
-namespace server {
+namespace net {
 namespace wifi {
-namespace wificond {
+namespace nl80211 {
 
 class NativeScanResult;
 class RadioChainInfo;
 
-}  // namespace wificond
+}  // namespace nl80211
 }  // namespace wifi
-}  // namespace server
+}  // namespace net
 }  // namespace android
-}  // namespace com
 
 namespace android {
 namespace wificond {
@@ -75,7 +73,7 @@ class ScanUtils {
   // Returns true on success.
   virtual bool GetScanResult(
       uint32_t interface_index,
-      std::vector<::com::android::server::wifi::wificond::NativeScanResult>* out_scan_results);
+      std::vector<android::net::wifi::nl80211::NativeScanResult>* out_scan_results);
 
   // Send scan request to kernel for interface with index |interface_index|.
   // - |request_random_mac| If true, request device/driver to use a random MAC
@@ -135,6 +133,7 @@ class ScanUtils {
       const SchedScanIntervalSetting& interval_setting,
       int32_t rssi_threshold_2g,
       int32_t rssi_threshold_5g,
+      int32_t rssi_threshold_6g,
       const SchedScanReqFlags& req_flags,
       const std::vector<std::vector<uint8_t>>& scan_ssids,
       const std::vector<std::vector<uint8_t>>& match_ssids,
@@ -189,14 +188,14 @@ class ScanUtils {
                        uint64_t* last_seen_since_boot_microseconds);
   bool ParseRadioChainInfos(
       const NL80211NestedAttr& bss,
-      std::vector<::com::android::server::wifi::wificond::RadioChainInfo>
+      std::vector<android::net::wifi::nl80211::RadioChainInfo>
         *radio_chain_infos);
   bool GetSSIDFromInfoElement(const std::vector<uint8_t>& ie,
                               std::vector<uint8_t>* ssid);
   // Converts a NL80211_CMD_NEW_SCAN_RESULTS packet to a ScanResult object.
   bool ParseScanResult(
       std::unique_ptr<const NL80211Packet> packet,
-      ::com::android::server::wifi::wificond::NativeScanResult* scan_result);
+      android::net::wifi::nl80211::NativeScanResult* scan_result);
 
   NetlinkManager* netlink_manager_;