| commit | 901300790d835bfe169ec62265db44ba71da19d4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Nov 21 03:24:58 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Nov 21 03:24:58 2020 +0000 |
| tree | 5f864e254548656834b9c6cb821f8bb84a9f2308 | |
| parent | 1b737ee54abfb3ea6b1cc6e877bec19fb7fba06f [diff] | |
| parent | 3b8cc0cf692746e2e5336eb121ca2a435f5bc363 [diff] |
Merge "wifi Clear the callbacks before executing terminate"
diff --git a/hostapd/hidl/1.3/hostapd.cpp b/hostapd/hidl/1.3/hostapd.cpp index ad0c0f2..274a079 100644 --- a/hostapd/hidl/1.3/hostapd.cpp +++ b/hostapd/hidl/1.3/hostapd.cpp
@@ -658,6 +658,9 @@ Return<void> Hostapd::terminate() { wpa_printf(MSG_INFO, "Terminating..."); + // Clear the callback to avoid IPCThreadState shutdown during the + // callback event. + callbacks_.clear(); eloop_terminate(); return Void(); }