[automerger skipped] p2p: avoid adding duplicate channel lists am: 245a5fad4f am: f579f3b97d -s ours
am skip reason: Merged-In I4185ad15bfa06dd41765d9fe5f159ad0d9e5f017 with SHA-1 afee24e08e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19204144
Change-Id: I93e85fab5674d1b6955addfa0511e562a387b5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/hostapd/aidl/aidl.cpp b/hostapd/aidl/aidl.cpp
index e02708c..c6088ed 100644
--- a/hostapd/aidl/aidl.cpp
+++ b/hostapd/aidl/aidl.cpp
@@ -34,7 +34,8 @@
int hostapd_aidl_init(struct hapd_interfaces *interfaces)
{
- wpa_printf(MSG_DEBUG, "Initializing aidl control");
+ wpa_printf(MSG_INFO, "Initializing aidl control");
+ wpa_printf(MSG_INFO, "Interface version: %d", Hostapd::version);
std::string instance; // declared here to allow use of goto
ABinderProcess_setupPolling(&aidl_fd);
diff --git a/wpa_supplicant/aidl/aidl_manager.cpp b/wpa_supplicant/aidl/aidl_manager.cpp
index da90c38..1791b2b 100644
--- a/wpa_supplicant/aidl/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/aidl_manager.cpp
@@ -400,6 +400,7 @@
{
// Create the main aidl service object and register it.
wpa_printf(MSG_INFO, "Starting AIDL supplicant");
+ wpa_printf(MSG_INFO, "Interface version: %d", Supplicant::version);
supplicant_object_ = ndk::SharedRefBase::make<Supplicant>(global);
wpa_global_ = global;
std::string instance = std::string() + Supplicant::descriptor + "/default";