summaryrefslogtreecommitdiffstats
path: root/client_interface_impl.h
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-08 16:57:18 -0700
committerXin Li <delphij@google.com>2020-09-08 16:57:18 -0700
commiteaf7c4998d15c61360bdcd716fb02b33acd8b526 (patch)
tree7535ac3f76cce213db2f66501107c5e68c4830e3 /client_interface_impl.h
parent0bcc0e4488989dad285c7664b4cdaa6eaad666d4 (diff)
parent7e90494ad7cd8b2a5f52781a636ae34af1904c97 (diff)
downloadplatform_system_connectivity_wificond-master.tar.gz
platform_system_connectivity_wificond-master.tar.bz2
platform_system_connectivity_wificond-master.zip
Merge Android RHEADmaster
Bug: 168057903 Merged-In: I3b0a326c6381091e8721811fb5ea352e6af1031f Change-Id: Id8a690a46c023b26372220ab8878b86b2b881eeb
Diffstat (limited to 'client_interface_impl.h')
-rw-r--r--client_interface_impl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/client_interface_impl.h b/client_interface_impl.h
index 5a27484..4ecbf1d 100644
--- a/client_interface_impl.h
+++ b/client_interface_impl.h
@@ -26,8 +26,8 @@
#include <utils/StrongPointer.h>
#include <wifi_system/interface_tool.h>
-#include "android/net/wifi/IClientInterface.h"
-#include "android/net/wifi/ISendMgmtFrameEvent.h"
+#include "android/net/wifi/nl80211/IClientInterface.h"
+#include "android/net/wifi/nl80211/ISendMgmtFrameEvent.h"
#include "wificond/net/mlme_event_handler.h"
#include "wificond/net/netlink_utils.h"
#include "wificond/scanning/scanner_impl.h"
@@ -72,23 +72,23 @@ class ClientInterfaceImpl {
virtual ~ClientInterfaceImpl();
// Get a pointer to the binder representing this ClientInterfaceImpl.
- android::sp<android::net::wifi::IClientInterface> GetBinder() const;
+ android::sp<android::net::wifi::nl80211::IClientInterface> GetBinder() const;
bool GetPacketCounters(std::vector<int32_t>* out_packet_counters);
bool SignalPoll(std::vector<int32_t>* out_signal_poll_results);
const std::array<uint8_t, ETH_ALEN>& GetMacAddress();
const std::string& GetInterfaceName() const { return interface_name_; }
const android::sp<ScannerImpl> GetScanner() { return scanner_; };
- bool SetMacAddress(const std::array<uint8_t, ETH_ALEN>& mac);
virtual bool IsAssociated() const;
void Dump(std::stringstream* ss) const;
void SendMgmtFrame(
const std::vector<uint8_t>& frame,
- const sp<::android::net::wifi::ISendMgmtFrameEvent>& callback,
+ const sp<::android::net::wifi::nl80211::ISendMgmtFrameEvent>& callback,
int32_t mcs);
private:
bool RefreshAssociateFreq();
+ bool OnChannelSwitchEvent(uint32_t frequency);
const uint32_t wiphy_index_;
const std::string interface_name_;