wifi: add an api route for removing a P2P client
Bug: 159098347
Test: atest FrameworksWifiTests
Change-Id: I8d8f949f40ede778c95625ef3c0f6eb82fae5a82
diff --git a/wpa_supplicant/aidl/p2p_iface.cpp b/wpa_supplicant/aidl/p2p_iface.cpp
index 8dcaad5..e1be7ce 100644
--- a/wpa_supplicant/aidl/p2p_iface.cpp
+++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -1018,6 +1018,14 @@
&P2pIface::setWfdR2DeviceInfoInternal, in_info);
}
+::ndk::ScopedAStatus P2pIface::removeClient(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &P2pIface::removeClientInternal, peer_address, isLegacyClient);
+}
+
std::pair<std::string, ndk::ScopedAStatus> P2pIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -2001,6 +2009,14 @@
return ndk::ScopedAStatus::ok();
}
+ndk::ScopedAStatus P2pIface::removeClientInternal(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient)
+{
+ struct wpa_supplicant* wpa_s = retrieveIfacePtr();
+ wpas_p2p_remove_client(wpa_s, peer_address.data(), isLegacyClient? 1 : 0);
+ return ndk::ScopedAStatus::ok();
+}
+
/**
* Retrieve the underlying |wpa_supplicant| struct
* pointer for this iface.
diff --git a/wpa_supplicant/aidl/p2p_iface.h b/wpa_supplicant/aidl/p2p_iface.h
index d24645c..1d57ddc 100644
--- a/wpa_supplicant/aidl/p2p_iface.h
+++ b/wpa_supplicant/aidl/p2p_iface.h
@@ -164,6 +164,8 @@
::ndk::ScopedAStatus getEdmg(bool* _aidl_return) override;
::ndk::ScopedAStatus setWfdR2DeviceInfo(
const std::vector<uint8_t>& in_info) override;
+ ::ndk::ScopedAStatus removeClient(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient) override;
private:
// Corresponding worker functions for the AIDL methods.
@@ -276,6 +278,8 @@
std::pair<bool, ndk::ScopedAStatus> getEdmgInternal();
ndk::ScopedAStatus setWfdR2DeviceInfoInternal(
const std::vector<uint8_t>& info);
+ ndk::ScopedAStatus removeClientInternal(
+ const std::vector<uint8_t>& peer_address, bool isLegacyClient);
struct wpa_supplicant* retrieveIfacePtr();
struct wpa_supplicant* retrieveGroupIfacePtr(