Snap for 11257657 from 1974d45f359a21d34cedfc5111e793c1e5072231 to 24Q2-release
Change-Id: I5816251438a60b84e8442c4ca19dd7119caac791
diff --git a/wpa_supplicant/aidl/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index cac9ddb..d0b3ae2 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -1611,7 +1611,7 @@
params.p2pDeviceAddress = macAddrToArray(dev_addr);
params.isRequest = aidl_is_request;
params.status = static_cast<P2pProvDiscStatusCode>(status);
- params.configMethods = static_cast<WpsConfigMethods>(config_methods);
+ params.configMethods = config_methods;
params.generatedPin = aidl_generated_pin;
if (group_ifname != NULL) {
params.groupInterfaceName = misc_utils::charBufToString(group_ifname);
diff --git a/wpa_supplicant/aidl/p2p_iface.cpp b/wpa_supplicant/aidl/p2p_iface.cpp
index ec52b44..e98ddb0 100644
--- a/wpa_supplicant/aidl/p2p_iface.cpp
+++ b/wpa_supplicant/aidl/p2p_iface.cpp
@@ -830,6 +830,14 @@
&P2pIface::findWithParamsInternal, in_discoveryInfo);
}
+::ndk::ScopedAStatus P2pIface::configureExtListenWithParams(
+ const P2pExtListenInfo& in_extListenInfo)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_IFACE_INVALID,
+ &P2pIface::configureExtListenWithParamsInternal, in_extListenInfo);
+}
+
std::pair<std::string, ndk::ScopedAStatus> P2pIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -1894,6 +1902,12 @@
}
}
+ndk::ScopedAStatus P2pIface::configureExtListenWithParamsInternal(
+ const P2pExtListenInfo& extListenInfo)
+{
+ return configureExtListenInternal(extListenInfo.periodMs, extListenInfo.intervalMs);
+}
+
/**
* 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 c4f036c..22d88eb 100644
--- a/wpa_supplicant/aidl/p2p_iface.h
+++ b/wpa_supplicant/aidl/p2p_iface.h
@@ -178,6 +178,9 @@
::ndk::ScopedAStatus connectWithParams(
const P2pConnectInfo& in_connectInfo, std::string* _aidl_return) override;
::ndk::ScopedAStatus findWithParams(const P2pDiscoveryInfo& in_discoveryInfo) override;
+ ::ndk::ScopedAStatus configureExtListenWithParams(
+ const P2pExtListenInfo& in_extListenInfo) override;
+
private:
// Corresponding worker functions for the AIDL methods.
@@ -304,6 +307,7 @@
std::pair<std::string, ndk::ScopedAStatus> connectWithParamsInternal(
const P2pConnectInfo& connectInfo);
ndk::ScopedAStatus findWithParamsInternal(const P2pDiscoveryInfo& discoveryInfo);
+ ndk::ScopedAStatus configureExtListenWithParamsInternal(const P2pExtListenInfo& extListenInfo);
struct wpa_supplicant* retrieveIfacePtr();
struct wpa_supplicant* retrieveGroupIfacePtr(