summaryrefslogtreecommitdiffstats
path: root/client_interface_binder.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_binder.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_binder.h')
-rw-r--r--client_interface_binder.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/client_interface_binder.h b/client_interface_binder.h
index b1fceea..d84d288 100644
--- a/client_interface_binder.h
+++ b/client_interface_binder.h
@@ -20,15 +20,15 @@
#include <android-base/macros.h>
#include <binder/Status.h>
-#include "android/net/wifi/BnClientInterface.h"
-#include "android/net/wifi/ISendMgmtFrameEvent.h"
+#include "android/net/wifi/nl80211/BnClientInterface.h"
+#include "android/net/wifi/nl80211/ISendMgmtFrameEvent.h"
namespace android {
namespace wificond {
class ClientInterfaceImpl;
-class ClientInterfaceBinder : public android::net::wifi::BnClientInterface {
+class ClientInterfaceBinder : public android::net::wifi::nl80211::BnClientInterface {
public:
explicit ClientInterfaceBinder(ClientInterfaceImpl* impl);
~ClientInterfaceBinder() override;
@@ -46,12 +46,10 @@ class ClientInterfaceBinder : public android::net::wifi::BnClientInterface {
std::vector<uint8_t>* out_mac_address) override;
::android::binder::Status getInterfaceName(std::string* out_name) override;
::android::binder::Status getWifiScannerImpl(
- ::android::sp<::android::net::wifi::IWifiScannerImpl>* out_wifi_scanner_impl) override;
- ::android::binder::Status setMacAddress(
- const ::std::vector<uint8_t>& mac, bool* success) override;
+ ::android::sp<::android::net::wifi::nl80211::IWifiScannerImpl>* out_wifi_scanner_impl) override;
::android::binder::Status 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) override;
private:
ClientInterfaceImpl* impl_;