Snap for 11186783 from 86b6fd078ec16f115d6427ce15814cda96f76d44 to 24Q1-release
Change-Id: I6b869b03291e30a555a8a154064ac5fc9b0925f7
diff --git a/wpa_supplicant/aidl/sta_network.cpp b/wpa_supplicant/aidl/sta_network.cpp
index 7b8b6ad..f373e71 100644
--- a/wpa_supplicant/aidl/sta_network.cpp
+++ b/wpa_supplicant/aidl/sta_network.cpp
@@ -898,6 +898,14 @@
&StaNetwork::disableEhtInternal);
}
+::ndk::ScopedAStatus StaNetwork::setVendorData(
+ const std::vector<common::OuiKeyedData>& in_vendorData)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_NETWORK_INVALID,
+ &StaNetwork::setVendorDataInternal, in_vendorData);
+}
+
std::pair<uint32_t, ndk::ScopedAStatus> StaNetwork::getIdInternal()
{
return {network_id_, ndk::ScopedAStatus::ok()};
@@ -2716,6 +2724,12 @@
return ndk::ScopedAStatus::ok();
}
+ndk::ScopedAStatus StaNetwork::setVendorDataInternal(
+ const std::vector<common::OuiKeyedData>& /* vendorData */) {
+ // Not implemented in the default implementation.
+ return ndk::ScopedAStatus::ok();
+}
+
/**
* WPA3-Enterprise 192-bit mode workaround to force the connection to EAP-TLSv1.2 due to
* interoperability issues in TLSv1.3 which disables the SSL_SIGN_RSA_PKCS1_SHA384
diff --git a/wpa_supplicant/aidl/sta_network.h b/wpa_supplicant/aidl/sta_network.h
index 879d874..b0cb3de 100644
--- a/wpa_supplicant/aidl/sta_network.h
+++ b/wpa_supplicant/aidl/sta_network.h
@@ -178,7 +178,9 @@
const std::vector<uint8_t>& in_selectedRcoi) override;
::ndk::ScopedAStatus setMinimumTlsVersionEapPhase1Param(
TlsVersion in_tlsVersion) override;
- ::ndk::ScopedAStatus disableEht() override;
+ ::ndk::ScopedAStatus disableEht() override;
+ ::ndk::ScopedAStatus setVendorData(
+ const std::vector<common::OuiKeyedData>& in_vendorData) override;
private:
// Corresponding worker functions for the AIDL methods.
@@ -311,7 +313,9 @@
ndk::ScopedAStatus setRoamingConsortiumSelectionInternal(
const std::vector<uint8_t>& selectedRcoi);
ndk::ScopedAStatus setMinimumTlsVersionEapPhase1ParamInternal(TlsVersion tlsVersion);
- ndk::ScopedAStatus disableEhtInternal();
+ ndk::ScopedAStatus disableEhtInternal();
+ ndk::ScopedAStatus setVendorDataInternal(
+ const std::vector<common::OuiKeyedData>& vendorData);
struct wpa_ssid* retrieveNetworkPtr();
struct wpa_supplicant* retrieveIfacePtr();