Convert supplicant service to use new AIDL interface.
Bug: 196235436
Test: Pass AIDL VTS tests and regression tests.
Change-Id: I0d7b75f526c13fc655a023d7dca088339b06b28e
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 5508f16..b3cb287 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -23,7 +23,7 @@
#include "p2p_supplicant.h"
#include "sme.h"
#include "notify.h"
-#include "hidl.h"
+#include "aidl.h"
int wpas_notify_supplicant_initialized(struct wpa_global *global)
{
@@ -35,11 +35,11 @@
}
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
-#ifdef CONFIG_HIDL
- global->hidl = wpas_hidl_init(global);
- if (!global->hidl)
+#ifdef CONFIG_AIDL
+ global->aidl = wpas_aidl_init(global);
+ if (!global->aidl)
return -1;
-#endif /* CONFIG_HIDL */
+#endif /* CONFIG_AIDL */
return 0;
}
@@ -52,10 +52,10 @@
wpas_dbus_deinit(global->dbus);
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
-#ifdef CONFIG_HIDL
- if (global->hidl)
- wpas_hidl_deinit(global->hidl);
-#endif /* CONFIG_HIDL */
+#ifdef CONFIG_AIDL
+ if (global->aidl)
+ wpas_aidl_deinit(global->aidl);
+#endif /* CONFIG_AIDL */
}
@@ -67,7 +67,7 @@
}
/* HIDL interface wants to keep track of the P2P mgmt iface. */
- if (wpas_hidl_register_interface(wpa_s))
+ if (wpas_aidl_register_interface(wpa_s))
return -1;
return 0;
@@ -82,7 +82,7 @@
}
/* HIDL interface wants to keep track of the P2P mgmt iface. */
- wpas_hidl_unregister_interface(wpa_s);
+ wpas_aidl_unregister_interface(wpa_s);
}
@@ -124,7 +124,7 @@
wpa_s->current_ssid->ssid_len) : "");
#endif /* ANDROID */
- wpas_hidl_notify_state_changed(wpa_s);
+ wpas_aidl_notify_state_changed(wpa_s);
}
@@ -135,7 +135,7 @@
wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_DISCONNECT_REASON);
- wpas_hidl_notify_disconnect_reason(wpa_s);
+ wpas_aidl_notify_disconnect_reason(wpa_s);
}
@@ -157,14 +157,14 @@
wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_ASSOC_STATUS_CODE);
- wpas_hidl_notify_assoc_reject(wpa_s, bssid, timed_out, assoc_resp_ie, assoc_resp_ie_len);
+ wpas_aidl_notify_assoc_reject(wpa_s, bssid, timed_out, assoc_resp_ie, assoc_resp_ie_len);
}
void wpas_notify_auth_timeout(struct wpa_supplicant *wpa_s) {
if (wpa_s->p2p_mgmt)
return;
- wpas_hidl_notify_auth_timeout(wpa_s);
+ wpas_aidl_notify_auth_timeout(wpa_s);
}
void wpas_notify_roam_time(struct wpa_supplicant *wpa_s)
@@ -202,7 +202,7 @@
wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSS_TM_STATUS);
#ifdef CONFIG_WNM
- wpas_hidl_notify_bss_tm_status(wpa_s);
+ wpas_aidl_notify_bss_tm_status(wpa_s);
#endif
}
@@ -232,7 +232,7 @@
wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_CURRENT_BSS);
- wpas_hidl_notify_bssid_changed(wpa_s);
+ wpas_aidl_notify_bssid_changed(wpa_s);
}
@@ -275,7 +275,7 @@
wpas_dbus_signal_network_request(wpa_s, ssid, rtype, default_txt);
- wpas_hidl_notify_network_request(wpa_s, ssid, rtype, default_txt);
+ wpas_aidl_notify_network_request(wpa_s, ssid, rtype, default_txt);
}
@@ -341,7 +341,7 @@
#ifdef CONFIG_WPS
wpas_dbus_signal_wps_event_fail(wpa_s, fail);
- wpas_hidl_notify_wps_event_fail(wpa_s, fail->peer_macaddr,
+ wpas_aidl_notify_wps_event_fail(wpa_s, fail->peer_macaddr,
fail->config_error,
fail->error_indication);
#endif /* CONFIG_WPS */
@@ -356,7 +356,7 @@
#ifdef CONFIG_WPS
wpas_dbus_signal_wps_event_success(wpa_s);
- wpas_hidl_notify_wps_event_success(wpa_s);
+ wpas_aidl_notify_wps_event_success(wpa_s);
#endif /* CONFIG_WPS */
}
@@ -368,7 +368,7 @@
#ifdef CONFIG_WPS
wpas_dbus_signal_wps_event_pbc_overlap(wpa_s);
- wpas_hidl_notify_wps_event_pbc_overlap(wpa_s);
+ wpas_aidl_notify_wps_event_pbc_overlap(wpa_s);
#endif /* CONFIG_WPS */
}
@@ -387,7 +387,7 @@
*/
if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s) {
wpas_dbus_register_network(wpa_s, ssid);
- wpas_hidl_register_network(wpa_s, ssid);
+ wpas_aidl_register_network(wpa_s, ssid);
}
}
@@ -397,7 +397,7 @@
{
#ifdef CONFIG_P2P
wpas_dbus_register_persistent_group(wpa_s, ssid);
- wpas_hidl_register_network(wpa_s, ssid);
+ wpas_aidl_register_network(wpa_s, ssid);
#endif /* CONFIG_P2P */
}
@@ -407,7 +407,7 @@
{
#ifdef CONFIG_P2P
wpas_dbus_unregister_persistent_group(wpa_s, ssid->id);
- wpas_hidl_unregister_network(wpa_s, ssid);
+ wpas_aidl_unregister_network(wpa_s, ssid);
#endif /* CONFIG_P2P */
}
@@ -422,7 +422,7 @@
if (!ssid->p2p_group && wpa_s->global->p2p_group_formation != wpa_s &&
!wpa_s->p2p_mgmt) {
wpas_dbus_unregister_network(wpa_s, ssid->id);
- wpas_hidl_unregister_network(wpa_s, ssid);
+ wpas_aidl_unregister_network(wpa_s, ssid);
}
if (network_is_persistent_group(ssid))
wpas_notify_persistent_group_removed(wpa_s, ssid);
@@ -640,7 +640,7 @@
/* Notify P2P find has stopped */
wpas_dbus_signal_p2p_find_stopped(wpa_s);
- wpas_hidl_notify_p2p_find_stopped(wpa_s);
+ wpas_aidl_notify_p2p_find_stopped(wpa_s);
}
@@ -658,7 +658,7 @@
/* Notify a new peer has been detected*/
wpas_dbus_signal_peer_device_found(wpa_s, info->p2p_device_addr);
- wpas_hidl_notify_p2p_device_found(wpa_s, addr, info,
+ wpas_aidl_notify_p2p_device_found(wpa_s, addr, info,
peer_wfd_device_info,
peer_wfd_device_info_len,
peer_wfd_r2_device_info,
@@ -674,7 +674,7 @@
/* Create signal on interface object*/
wpas_dbus_signal_peer_device_lost(wpa_s, dev_addr);
- wpas_hidl_notify_p2p_device_lost(wpa_s, dev_addr);
+ wpas_aidl_notify_p2p_device_lost(wpa_s, dev_addr);
}
@@ -686,7 +686,7 @@
wpas_dbus_unregister_p2p_group(wpa_s, ssid);
- wpas_hidl_notify_p2p_group_removed(wpa_s, ssid, role);
+ wpas_aidl_notify_p2p_group_removed(wpa_s, ssid, role);
}
@@ -695,7 +695,7 @@
{
wpas_dbus_signal_p2p_go_neg_req(wpa_s, src, dev_passwd_id, go_intent);
- wpas_hidl_notify_p2p_go_neg_req(wpa_s, src, dev_passwd_id, go_intent);
+ wpas_aidl_notify_p2p_go_neg_req(wpa_s, src, dev_passwd_id, go_intent);
}
@@ -704,7 +704,7 @@
{
wpas_dbus_signal_p2p_go_neg_resp(wpa_s, res);
- wpas_hidl_notify_p2p_go_neg_completed(wpa_s, res);
+ wpas_aidl_notify_p2p_go_neg_completed(wpa_s, res);
}
@@ -713,7 +713,7 @@
{
wpas_dbus_signal_p2p_invitation_result(wpa_s, status, bssid);
- wpas_hidl_notify_p2p_invitation_result(wpa_s, status, bssid);
+ wpas_aidl_notify_p2p_invitation_result(wpa_s, status, bssid);
}
@@ -734,7 +734,7 @@
wpas_dbus_signal_p2p_sd_response(wpa_s, sa, update_indic,
tlvs, tlvs_len);
- wpas_hidl_notify_p2p_sd_response(wpa_s, sa, update_indic,
+ wpas_aidl_notify_p2p_sd_response(wpa_s, sa, update_indic,
tlvs, tlvs_len);
}
@@ -762,7 +762,7 @@
status, config_methods,
generated_pin);
- wpas_hidl_notify_p2p_provision_discovery(wpa_s, dev_addr, request,
+ wpas_aidl_notify_p2p_provision_discovery(wpa_s, dev_addr, request,
status, config_methods,
generated_pin);
@@ -778,7 +778,7 @@
wpas_dbus_signal_p2p_group_started(wpa_s, client, persistent, ip);
- wpas_hidl_notify_p2p_group_started(wpa_s, ssid, persistent, client);
+ wpas_aidl_notify_p2p_group_started(wpa_s, ssid, persistent, client);
}
@@ -788,7 +788,7 @@
/* Notify a group formation failed */
wpas_dbus_signal_p2p_group_formation_failure(wpa_s, reason);
- wpas_hidl_notify_p2p_group_formation_failure(wpa_s, reason);
+ wpas_aidl_notify_p2p_group_formation_failure(wpa_s, reason);
}
@@ -807,7 +807,7 @@
wpas_dbus_signal_p2p_invitation_received(wpa_s, sa, go_dev_addr, bssid,
id, op_freq);
- wpas_hidl_notify_p2p_invitation_received(wpa_s, sa, go_dev_addr, bssid,
+ wpas_aidl_notify_p2p_invitation_received(wpa_s, sa, go_dev_addr, bssid,
id, op_freq);
}
@@ -835,7 +835,7 @@
/* Notify listeners a new station has been authorized */
wpas_dbus_signal_sta_authorized(wpa_s, sta);
- wpas_hidl_notify_ap_sta_authorized(wpa_s, sta, p2p_dev_addr);
+ wpas_aidl_notify_ap_sta_authorized(wpa_s, sta, p2p_dev_addr);
}
@@ -855,7 +855,7 @@
/* Notify listeners a station has been deauthorized */
wpas_dbus_signal_sta_deauthorized(wpa_s, sta);
- wpas_hidl_notify_ap_sta_deauthorized(wpa_s, sta, p2p_dev_addr);
+ wpas_aidl_notify_ap_sta_deauthorized(wpa_s, sta, p2p_dev_addr);
/* Unregister the station */
wpas_dbus_unregister_sta(wpa_s, sta);
}
@@ -935,7 +935,7 @@
{
wpa_dbg(wpa_s, MSG_ERROR,
"EAP Error code = %d", error_code);
- wpas_hidl_notify_eap_error(wpa_s, error_code);
+ wpas_aidl_notify_eap_error(wpa_s, error_code);
}
@@ -982,7 +982,7 @@
if (!wpa_s || !bssid || !anqp)
return;
- wpas_hidl_notify_anqp_query_done(wpa_s, bssid, result, anqp);
+ wpas_aidl_notify_anqp_query_done(wpa_s, bssid, result, anqp);
#endif /* CONFIG_INTERWORKING */
}
@@ -994,7 +994,7 @@
if (!wpa_s || !bssid || !file_name || !image)
return;
- wpas_hidl_notify_hs20_icon_query_done(wpa_s, bssid, file_name, image,
+ wpas_aidl_notify_hs20_icon_query_done(wpa_s, bssid, file_name, image,
image_length);
#endif /* CONFIG_HS20 */
}
@@ -1007,7 +1007,7 @@
if (!wpa_s || !url)
return;
- wpas_hidl_notify_hs20_rx_subscription_remediation(wpa_s, url, osu_method);
+ wpas_aidl_notify_hs20_rx_subscription_remediation(wpa_s, url, osu_method);
#endif /* CONFIG_HS20 */
}
@@ -1019,7 +1019,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_hs20_rx_deauth_imminent_notice(wpa_s, code, reauth_delay,
+ wpas_aidl_notify_hs20_rx_deauth_imminent_notice(wpa_s, code, reauth_delay,
url);
#endif /* CONFIG_HS20 */
}
@@ -1030,7 +1030,7 @@
if (!wpa_s || !url)
return;
- wpas_hidl_notify_hs20_rx_terms_and_conditions_acceptance(wpa_s, url);
+ wpas_aidl_notify_hs20_rx_terms_and_conditions_acceptance(wpa_s, url);
#endif /* CONFIG_HS20 */
}
@@ -1092,7 +1092,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_config_received(wpa_s, ssid);
+ wpas_aidl_notify_dpp_config_received(wpa_s, ssid);
#endif /* CONFIG_DPP */
}
@@ -1102,7 +1102,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_config_sent(wpa_s);
+ wpas_aidl_notify_dpp_config_sent(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1113,7 +1113,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_auth_success(wpa_s);
+ wpas_aidl_notify_dpp_auth_success(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1123,7 +1123,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_resp_pending(wpa_s);
+ wpas_aidl_notify_dpp_resp_pending(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1134,7 +1134,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_not_compatible(wpa_s);
+ wpas_aidl_notify_dpp_not_compatible(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1144,7 +1144,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_missing_auth(wpa_s);
+ wpas_aidl_notify_dpp_missing_auth(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1154,7 +1154,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_configuration_failure(wpa_s);
+ wpas_aidl_notify_dpp_configuration_failure(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1164,7 +1164,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_timeout(wpa_s);
+ wpas_aidl_notify_dpp_timeout(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1174,7 +1174,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_auth_failure(wpa_s);
+ wpas_aidl_notify_dpp_auth_failure(wpa_s);
#endif /* CONFIG_DPP */
}
@@ -1184,21 +1184,21 @@
if (!wpa_s)
return;
- wpas_hidl_notify_dpp_fail(wpa_s);
+ wpas_aidl_notify_dpp_fail(wpa_s);
#endif /* CONFIG_DPP */
}
void wpas_notify_dpp_config_sent_wait_response(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_DPP2
- wpas_hidl_notify_dpp_config_sent_wait_response(wpa_s);
+ wpas_aidl_notify_dpp_config_sent_wait_response(wpa_s);
#endif /* CONFIG_DPP2 */
}
void wpas_notify_dpp_config_accepted(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_DPP2
- wpas_hidl_notify_dpp_config_accepted(wpa_s);
+ wpas_aidl_notify_dpp_config_accepted(wpa_s);
#endif /* CONFIG_DPP2 */
}
@@ -1207,14 +1207,14 @@
const char *channel_list, unsigned short band_list[], int size)
{
#ifdef CONFIG_DPP2
- wpas_hidl_notify_dpp_conn_status(wpa_s, status, ssid, channel_list, band_list, size);
+ wpas_aidl_notify_dpp_conn_status(wpa_s, status, ssid, channel_list, band_list, size);
#endif /* CONFIG_DPP2 */
}
void wpas_notify_dpp_config_rejected(struct wpa_supplicant *wpa_s)
{
#ifdef CONFIG_DPP2
- wpas_hidl_notify_dpp_config_rejected(wpa_s);
+ wpas_aidl_notify_dpp_config_rejected(wpa_s);
#endif /* CONFIG_DPP2 */
}
@@ -1224,7 +1224,7 @@
if (!wpa_s)
return;
- wpas_hidl_notify_pmk_cache_added(wpa_s, entry);
+ wpas_aidl_notify_pmk_cache_added(wpa_s, entry);
}
void wpas_notify_transition_disable(struct wpa_supplicant *wpa_s,
@@ -1237,7 +1237,7 @@
if (!ssid)
return;
- wpas_hidl_notify_transition_disable(wpa_s, ssid, bitmap);
+ wpas_aidl_notify_transition_disable(wpa_s, ssid, bitmap);
}
void wpas_notify_network_not_found(struct wpa_supplicant *wpa_s)
@@ -1245,5 +1245,5 @@
if (!wpa_s)
return;
- wpas_hidl_notify_network_not_found(wpa_s);
+ wpas_aidl_notify_network_not_found(wpa_s);
}