Add temporary default implementation for
the USD methods.
Avoids a linker error on the Cuttlefish targets,
which do not seem to enable the CONFIG_NAN_USD
flag. The long-term fix will be to enable that
flag in the Cuttlefish build file.
Bug: 384527237
Bug: 382756996
Test: Pre-submit builds pass for the CF targets
Change-Id: I0f86c8518e24895bbce7d978bbf95efaba111de7
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.cpp b/wpa_supplicant/aidl/vendor/sta_iface.cpp
index f9ed88b..bc17fbf 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.cpp
+++ b/wpa_supplicant/aidl/vendor/sta_iface.cpp
@@ -2628,6 +2628,9 @@
return {capabilities, ndk::ScopedAStatus::ok()};
}
+// TODO (b/384527237): Fix linker error to avoid having a separate default implementation
+#ifdef CONFIG_NAN_USD
+
ndk::ScopedAStatus StaIface::startUsdPublishInternal(
const UsdPublishConfig& usdPublishConfig) {
return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
@@ -2655,6 +2658,37 @@
return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
}
+#else /* CONFIG_NAN_USD */
+
+ndk::ScopedAStatus StaIface::startUsdPublishInternal(
+ const UsdPublishConfig& usdPublishConfig) {
+ return createStatus(SupplicantStatusCode::FAILURE_UNSUPPORTED);
+}
+
+ndk::ScopedAStatus StaIface::startUsdSubscribeInternal(
+ const UsdSubscribeConfig& usdSubscribeConfig) {
+ return 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);
+}
+
+#endif /* CONFIG_NAN_USD */
+
/**
* Retrieve the underlying |wpa_supplicant| struct
* pointer for this iface.