Change the publish/subscribe return types to void
in the supplicant implementation.
Bug: 340878198
Test: m
Change-Id: Ieafaf62de9d4a2f312304c1be778d7ea7bb9b33a
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.cpp b/wpa_supplicant/aidl/vendor/sta_iface.cpp
index ce873d9..1a6ae08 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.cpp
+++ b/wpa_supplicant/aidl/vendor/sta_iface.cpp
@@ -851,19 +851,19 @@
}
::ndk::ScopedAStatus StaIface::startUsdPublish(int32_t in_cmdId,
- const UsdPublishConfig& in_usdPublishConfig, int32_t* _aidl_return)
+ const UsdPublishConfig& in_usdPublishConfig)
{
return validateAndCall(
this, SupplicantStatusCode::FAILURE_UNKNOWN,
- &StaIface::startUsdPublishInternal, _aidl_return, in_usdPublishConfig);
+ &StaIface::startUsdPublishInternal, in_usdPublishConfig);
}
::ndk::ScopedAStatus StaIface::startUsdSubscribe(int32_t in_cmdId,
- const UsdSubscribeConfig& in_usdSubscribeConfig, int32_t* _aidl_return)
+ const UsdSubscribeConfig& in_usdSubscribeConfig)
{
return validateAndCall(
this, SupplicantStatusCode::FAILURE_UNKNOWN,
- &StaIface::startUsdSubscribeInternal, _aidl_return, in_usdSubscribeConfig);
+ &StaIface::startUsdSubscribeInternal, in_usdSubscribeConfig);
}
::ndk::ScopedAStatus StaIface::updateUsdPublish(int32_t in_publishId,
@@ -2612,14 +2612,14 @@
return {capabilities, ndk::ScopedAStatus::ok()};
}
-std::pair<int32_t, ndk::ScopedAStatus> StaIface::startUsdPublishInternal(
+ndk::ScopedAStatus StaIface::startUsdPublishInternal(
const UsdPublishConfig& usdPublishConfig) {
- return {-1, createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
}
-std::pair<int32_t, ndk::ScopedAStatus> StaIface::startUsdSubscribeInternal(
+ndk::ScopedAStatus StaIface::startUsdSubscribeInternal(
const UsdSubscribeConfig& usdSubscribeConfig) {
- return {-1, createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED)};
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
}
::ndk::ScopedAStatus StaIface::updateUsdPublishInternal(int32_t publishId,
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.h b/wpa_supplicant/aidl/vendor/sta_iface.h
index d958f2e..6c6cfb9 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.h
+++ b/wpa_supplicant/aidl/vendor/sta_iface.h
@@ -169,9 +169,9 @@
::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);
+ const UsdPublishConfig& in_usdPublishConfig);
::ndk::ScopedAStatus startUsdSubscribe(int32_t in_cmdId,
- const UsdSubscribeConfig& in_usdSubscribeConfig, int32_t* _aidl_return);
+ const UsdSubscribeConfig& in_usdSubscribeConfig);
::ndk::ScopedAStatus updateUsdPublish(int32_t in_publishId,
const std::vector<uint8_t>& in_serviceSpecificInfo);
::ndk::ScopedAStatus cancelUsdPublish(int32_t in_publishId);
@@ -292,10 +292,8 @@
::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 startUsdPublishInternal(const UsdPublishConfig& usdPublishConfig);
+ ::ndk::ScopedAStatus startUsdSubscribeInternal(const UsdSubscribeConfig& usdSubscribeConfig);
::ndk::ScopedAStatus updateUsdPublishInternal(int32_t publishId,
const std::vector<uint8_t>& serviceSpecificInfo);
::ndk::ScopedAStatus cancelUsdPublishInternal(int32_t publishId);