| commit | f1fdc7e52b88629e7366ca2a64c44ad9eddd31ca | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 18 22:25:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 22:25:12 2021 +0000 |
| tree | 55606e55e46d8146224bff6357929f3c23cb4717 | |
| parent | 066e7b61f76778a4d3472ba92e8dc61be83890c1 [diff] | |
| parent | a2028dc24edc9515f0d13b289e64e61f19ca96b1 [diff] |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 15ab8967bb -s ours am: a2028dc24e -s ours am skip reason: Merged-In I2d3f9c89ea02f7c813841ba1d5b376d7c0f977bf with SHA-1 d435d3abd9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/16279585 Change-Id: I75035d03753252f29ef39b2c186dee3df4e914b7
diff --git a/hostapd/hidl/1.3/hostapd.cpp b/hostapd/hidl/1.3/hostapd.cpp index f9d2647..72efd3f 100644 --- a/hostapd/hidl/1.3/hostapd.cpp +++ b/hostapd/hidl/1.3/hostapd.cpp
@@ -919,7 +919,15 @@ iface_hapd->own_addr); } } - }; + else if (os_strncmp(txt, AP_EVENT_DISABLED, + strlen(AP_EVENT_DISABLED)) == 0) { + // Invoke the failure callback on all registered clients. + for (const auto& callback : callbacks_) { + callback->onFailure(strlen(iface_hapd->conf->bridge) > 0 ? + iface_hapd->conf->bridge : iface_hapd->conf->iface); + } + } + }; // Setup callback iface_hapd->setup_complete_cb = onAsyncSetupCompleteCb;
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index 53082f5..de51772 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c
@@ -1673,6 +1673,9 @@ hostapd_switch_channel_fallback(hapd->iface, &hapd->cs_freq_params); } + + // inform framework that interface is unavailable + hostapd_disable_iface(hapd->iface); }