Merge "ANDROID: filter USD events for mainline supplicant" into main
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 006a4ea..d5dfec9 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -6252,6 +6252,15 @@
wpa_s->valid_links);
}
+#ifdef MAINLINE_SUPPLICANT
+static bool is_event_allowlisted(enum wpa_event_type event) {
+ return event == EVENT_RX_MGMT ||
+ event == EVENT_REMAIN_ON_CHANNEL ||
+ event == EVENT_CANCEL_REMAIN_ON_CHANNEL ||
+ event == EVENT_TX_WAIT_EXPIRE;
+}
+#endif /* MAINLINE_SUPPLICANT */
+
void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
union wpa_event_data *data)
@@ -6263,6 +6272,15 @@
int level = MSG_DEBUG;
#endif /* CONFIG_NO_STDOUT_DEBUG */
+#ifdef MAINLINE_SUPPLICANT
+ if (!is_event_allowlisted(event)) {
+ wpa_dbg(wpa_s, MSG_DEBUG,
+ "Ignore event %s (%d) which is not allowlisted",
+ event_to_string(event), event);
+ return;
+ }
+#endif /* MAINLINE_SUPPLICANT */
+
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED &&
event != EVENT_INTERFACE_ENABLED &&
event != EVENT_INTERFACE_STATUS &&