commit e4c51316c9315c5aad02beb23eea12c3913d642b
author Gabriel Biren <gbiren@google.com> Mon Mar 10 16:15:48 2025 +0000
committer Gabriel Biren <gbiren@google.com> Tue Mar 11 18:52:22 2025 +0000
tree a89ead8cc3a5f1cdd5eca99edb6b43a0bce60547
parent 544efd9e7cc0f06335172e9673feffc72674d34b

Rename PublishConfig and SubscribeConfig in
the mainline supplicant implementation.

Bug: 365585450
Test: m
Change-Id: I88ea6b9119156598ca4ee3915a874cb6714a8af8

wpa_supplicant/aidl/mainline/sta_iface.cpp

diff --git a/wpa_supplicant/aidl/mainline/sta_iface.cpp b/wpa_supplicant/aidl/mainline/sta_iface.cpp
index bfa9c9e..6104033 100644
--- a/wpa_supplicant/aidl/mainline/sta_iface.cpp
+++ b/wpa_supplicant/aidl/mainline/sta_iface.cpp
@@ -21,12 +21,12 @@
 }
 
 ::ndk::ScopedAStatus StaIface::startUsdPublish(int32_t in_cmdId,
-        const PublishConfig& in_usdPublishConfig) {
+        const UsdPublishConfig& in_publishConfig) {
     return ndk::ScopedAStatus::ok();
 }
 
 ::ndk::ScopedAStatus StaIface::startUsdSubscribe(int32_t in_cmdId,
-        const SubscribeConfig& in_usdSubscribeConfig) {
+        const UsdSubscribeConfig& in_subscribeConfig) {
     return ndk::ScopedAStatus::ok();
 }
 

wpa_supplicant/aidl/mainline/sta_iface.h

diff --git a/wpa_supplicant/aidl/mainline/sta_iface.h b/wpa_supplicant/aidl/mainline/sta_iface.h
index 84ad201..213eacf 100644
--- a/wpa_supplicant/aidl/mainline/sta_iface.h
+++ b/wpa_supplicant/aidl/mainline/sta_iface.h
@@ -23,9 +23,9 @@
             const std::shared_ptr<IStaInterfaceCallback>& in_callback) override;
         ::ndk::ScopedAStatus getUsdCapabilities(UsdCapabilities* _aidl_return) override;
         ::ndk::ScopedAStatus startUsdPublish(int32_t in_cmdId,
-            const PublishConfig& in_usdPublishConfig) override;
+            const UsdPublishConfig& in_publishConfig) override;
         ::ndk::ScopedAStatus startUsdSubscribe(int32_t in_cmdId,
-            const SubscribeConfig& in_usdSubscribeConfig) override;
+            const UsdSubscribeConfig& in_subscribeConfig) override;
         ::ndk::ScopedAStatus updateUsdPublish(int32_t in_publishId,
             const std::vector<uint8_t>& in_serviceSpecificInfo) override;
         ::ndk::ScopedAStatus cancelUsdPublish(int32_t in_publishId) override;