commit | efa4bf808022162aee4328cd3d66e763f10a1deb | [log] [tgz] |
---|---|---|
author | Les Lee <lesl@google.com> | Fri Sep 24 00:29:54 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 24 00:29:54 2021 +0000 |
tree | f40bedc36a4766279e2a267986e9257ba5750233 | |
parent | 040a99417e0fcffeec2856d68d1e12d3bfadc74b [diff] | |
parent | e74e6986e64152b7189d5216a20803666273e2ae [diff] |
wifi: Fix incorrect iface when handling interface init failure am: f0def8fc18 am: e74e6986e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15888531 Change-Id: I647d8b42c30b00f8f5a69f6d3f42c9641be7183f
diff --git a/hostapd/hidl/1.3/hostapd.cpp b/hostapd/hidl/1.3/hostapd.cpp index 6add761..f9d2647 100644 --- a/hostapd/hidl/1.3/hostapd.cpp +++ b/hostapd/hidl/1.3/hostapd.cpp
@@ -879,8 +879,8 @@ // Invoke the failure callback on all registered // clients. for (const auto& callback : callbacks_) { - callback->onFailure( - iface_hapd->conf->iface); + callback->onFailure(strlen(iface_hapd->conf->bridge) > 0 ? + iface_hapd->conf->bridge : iface_hapd->conf->iface); } } };