Snap for 12838584 from e9e8e0f4182253782fe19a5e99308e48efa1858a to 25Q2-release
Change-Id: Iacedf41103a62f0ffc21d3821d56026c6f9be0f6
diff --git a/OWNERS b/OWNERS
index bed29cb..5ddabe7 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
etancohen@google.com
arabawy@google.com
kumachang@google.com
+include platform/system/core:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}
diff --git a/wpa_supplicant/aidl/vendor/sta_iface.cpp b/wpa_supplicant/aidl/vendor/sta_iface.cpp
index 478874d..aebd92a 100644
--- a/wpa_supplicant/aidl/vendor/sta_iface.cpp
+++ b/wpa_supplicant/aidl/vendor/sta_iface.cpp
@@ -395,7 +395,6 @@
}
struct nan_publish_params convertAidlNanPublishParamsToInternal(UsdPublishConfig publishConfig) {
- // TODO: Fill the disable_events field
struct nan_publish_params nanPublishParams;
nanPublishParams.unsolicited =
publishConfig.publishType == UsdPublishConfig::PublishType::UNSOLICITED_ONLY
@@ -409,6 +408,7 @@
nanPublishParams.fsd = publishConfig.isFsd;
nanPublishParams.freq = publishConfig.usdBaseConfig.defaultFreqMhz;
nanPublishParams.announcement_period = publishConfig.announcementPeriodMillis;
+ nanPublishParams.disable_events = !publishConfig.eventsEnabled;
// Pass the original pointer to the freq list, since the receiver will memcpy the data
nanPublishParams.freq_list = publishConfig.usdBaseConfig.freqsMhz.data();
return nanPublishParams;