aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Ravi <sunilravi@google.com>2021-06-17 19:51:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-06-17 19:51:33 +0000
commitfac34aee1da2a2eb14b73ee9730e12eed984c816 (patch)
tree4247dd0923342e42ee9509ed972d6bfd284f1aab
parenta9478a90f91b0d0c5148526df3e9e4607b677607 (diff)
parent6a16d8c74cd60e030728f2ea53fb1e2358a9407c (diff)
downloadwpa_supplicant_8-fac34aee1da2a2eb14b73ee9730e12eed984c816.tar.gz
Merge "Fix for dropping p2p group remove event in HIDL" into sc-dev
-rw-r--r--wpa_supplicant/hidl/1.4/hidl_manager.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/wpa_supplicant/hidl/1.4/hidl_manager.cpp b/wpa_supplicant/hidl/1.4/hidl_manager.cpp
index 4a09da10..0a5fcebc 100644
--- a/wpa_supplicant/hidl/1.4/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.4/hidl_manager.cpp
@@ -2176,6 +2176,14 @@ struct wpa_supplicant *HidlManager::getTargetP2pIfaceForGroup(
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;