| commit | 8d98edfc78deef60367536d3afd687c5b01fa7a7 | [log] [tgz] |
|---|---|---|
| author | Sunil Ravi <sunilravi@google.com> | Thu Jun 17 20:00:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 20:00:56 2021 +0000 |
| tree | 4247dd0923342e42ee9509ed972d6bfd284f1aab | |
| parent | 76ec78b92ad6c3dbf4ccfe91617579dde15db11f [diff] | |
| parent | fac34aee1da2a2eb14b73ee9730e12eed984c816 [diff] |
Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev am: fac34aee1d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15005119 Change-Id: I08448408530786b4c29df0ba68680f35aa5fe19e
diff --git a/wpa_supplicant/hidl/1.4/hidl_manager.cpp b/wpa_supplicant/hidl/1.4/hidl_manager.cpp index 4a09da1..0a5fceb 100644 --- a/wpa_supplicant/hidl/1.4/hidl_manager.cpp +++ b/wpa_supplicant/hidl/1.4/hidl_manager.cpp
@@ -2176,6 +2176,14 @@ return NULL; struct wpa_supplicant *target_wpa_s = wpa_group_s->parent; + + // check wpa_supplicant object is a p2p device interface + if ((wpa_group_s == wpa_group_s->p2pdev) && wpa_group_s->p2p_mgmt) { + if (p2p_iface_object_map_.find(wpa_group_s->ifname) != + p2p_iface_object_map_.end()) + return wpa_group_s; + } + if (p2p_iface_object_map_.find(target_wpa_s->ifname) != p2p_iface_object_map_.end()) return target_wpa_s;