Snap for 12727401 from 23b36c8a9dd2372b8103a0ea354ca69a8c422abe to 25Q1-release
Change-Id: I2c61417202ea4f2fa2647209e8aa8cf2ae7b182b
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.cpp b/wpa_supplicant/aidl/vendor/sta_iface.cpp
index e2343b8..ce873d9 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.cpp
+++ b/wpa_supplicant/aidl/vendor/sta_iface.cpp
@@ -843,6 +843,58 @@
&StaIface::disableMscsInternal);
}
+::ndk::ScopedAStatus StaIface::getUsdCapabilities(UsdCapabilities* _aidl_return)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::getUsdCapabilitiesInternal, _aidl_return);
+}
+
+::ndk::ScopedAStatus StaIface::startUsdPublish(int32_t in_cmdId,
+ const UsdPublishConfig& in_usdPublishConfig, int32_t* _aidl_return)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::startUsdPublishInternal, _aidl_return, in_usdPublishConfig);
+}
+
+::ndk::ScopedAStatus StaIface::startUsdSubscribe(int32_t in_cmdId,
+ const UsdSubscribeConfig& in_usdSubscribeConfig, int32_t* _aidl_return)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::startUsdSubscribeInternal, _aidl_return, in_usdSubscribeConfig);
+}
+
+::ndk::ScopedAStatus StaIface::updateUsdPublish(int32_t in_publishId,
+ const std::vector<uint8_t>& in_serviceSpecificInfo)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::updateUsdPublishInternal, in_publishId, in_serviceSpecificInfo);
+}
+
+::ndk::ScopedAStatus StaIface::cancelUsdPublish(int32_t in_publishId)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::cancelUsdPublishInternal, in_publishId);
+}
+
+::ndk::ScopedAStatus StaIface::cancelUsdSubscribe(int32_t in_subscribeId)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::cancelUsdSubscribeInternal, in_subscribeId);
+}
+
+::ndk::ScopedAStatus StaIface::sendUsdMessage(const UsdMessageInfo& in_messageInfo)
+{
+ return validateAndCall(
+ this, SupplicantStatusCode::FAILURE_UNKNOWN,
+ &StaIface::sendUsdMessageInternal, in_messageInfo);
+}
+
std::pair<std::string, ndk::ScopedAStatus> StaIface::getNameInternal()
{
return {ifname_, ndk::ScopedAStatus::ok()};
@@ -2555,6 +2607,38 @@
return ndk::ScopedAStatus::ok();
}
+std::pair<UsdCapabilities, ndk::ScopedAStatus> StaIface::getUsdCapabilitiesInternal() {
+ UsdCapabilities capabilities;
+ return {capabilities, ndk::ScopedAStatus::ok()};
+}
+
+std::pair<int32_t, ndk::ScopedAStatus> StaIface::startUsdPublishInternal(
+ const UsdPublishConfig& usdPublishConfig) {
+ return {-1, createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
+}
+
+std::pair<int32_t, ndk::ScopedAStatus> StaIface::startUsdSubscribeInternal(
+ const UsdSubscribeConfig& usdSubscribeConfig) {
+ return {-1, createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
+}
+
+::ndk::ScopedAStatus StaIface::updateUsdPublishInternal(int32_t publishId,
+ const std::vector<uint8_t>& serviceSpecificInfo) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
+}
+
+::ndk::ScopedAStatus StaIface::cancelUsdPublishInternal(int32_t publishId) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
+}
+
+::ndk::ScopedAStatus StaIface::cancelUsdSubscribeInternal(int32_t subscribeId) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
+}
+
+::ndk::ScopedAStatus StaIface::sendUsdMessageInternal(const UsdMessageInfo& messageInfo) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
+}
+
/**
* Retrieve the underlying |wpa_supplicant| struct
* pointer for this iface.
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.h b/wpa_supplicant/aidl/vendor/sta_iface.h
index b52c6b0..d958f2e 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.h
+++ b/wpa_supplicant/aidl/vendor/sta_iface.h
@@ -167,6 +167,16 @@
std::vector<QosPolicyScsRequestStatus>* _aidl_return) override;
::ndk::ScopedAStatus configureMscs(const MscsParams& in_params) override;
::ndk::ScopedAStatus disableMscs() override;
+ ::ndk::ScopedAStatus getUsdCapabilities(UsdCapabilities* _aidl_return);
+ ::ndk::ScopedAStatus startUsdPublish(int32_t in_cmdId,
+ const UsdPublishConfig& in_usdPublishConfig, int32_t* _aidl_return);
+ ::ndk::ScopedAStatus startUsdSubscribe(int32_t in_cmdId,
+ const UsdSubscribeConfig& in_usdSubscribeConfig, int32_t* _aidl_return);
+ ::ndk::ScopedAStatus updateUsdPublish(int32_t in_publishId,
+ const std::vector<uint8_t>& in_serviceSpecificInfo);
+ ::ndk::ScopedAStatus cancelUsdPublish(int32_t in_publishId);
+ ::ndk::ScopedAStatus cancelUsdSubscribe(int32_t in_subscribeId);
+ ::ndk::ScopedAStatus sendUsdMessage(const UsdMessageInfo& in_messageInfo);
private:
// Corresponding worker functions for the AIDL methods.
@@ -281,6 +291,16 @@
const std::vector<uint8_t>& scsPolicyIds);
::ndk::ScopedAStatus configureMscsInternal(const MscsParams& params);
::ndk::ScopedAStatus disableMscsInternal();
+ std::pair<UsdCapabilities, ndk::ScopedAStatus> getUsdCapabilitiesInternal();
+ std::pair<int32_t, ndk::ScopedAStatus> startUsdPublishInternal(
+ const UsdPublishConfig& usdPublishConfig);
+ std::pair<int32_t, ndk::ScopedAStatus> startUsdSubscribeInternal(
+ const UsdSubscribeConfig& usdSubscribeConfig);
+ ::ndk::ScopedAStatus updateUsdPublishInternal(int32_t publishId,
+ const std::vector<uint8_t>& serviceSpecificInfo);
+ ::ndk::ScopedAStatus cancelUsdPublishInternal(int32_t publishId);
+ ::ndk::ScopedAStatus cancelUsdSubscribeInternal(int32_t subscribeId);
+ ::ndk::ScopedAStatus sendUsdMessageInternal(const UsdMessageInfo& messageInfo);
struct wpa_supplicant* retrieveIfacePtr();