Add dummy BSSID to invitation result event
Connection fails when GO or P2P device reinvokes P2P device
whose credential is already forgotten.
That's because wpa_supplicant doesn't send invitation result
event because BSSID is null. Add dummy BSSID to send it.
Bug: 62007204
Bug: 62007016
Change-Id: Ica8d3e9814f91d1786e7beb5f904de7de51de598
Singed-off-by Daisuke Niwa <daisuke.x.niwa@sonymobile.com>
diff --git a/wpa_supplicant/hidl/1.0/hidl.cpp b/wpa_supplicant/hidl/1.0/hidl.cpp
index e5f5303..ca914b4 100644
--- a/wpa_supplicant/hidl/1.0/hidl.cpp
+++ b/wpa_supplicant/hidl/1.0/hidl.cpp
@@ -530,13 +530,18 @@
void wpas_hidl_notify_p2p_invitation_result(
struct wpa_supplicant *wpa_s, int status, const u8 *bssid)
{
- if (!wpa_s || !bssid)
+ if (!wpa_s)
return;
-
- wpa_printf(
- MSG_DEBUG,
- "Notifying P2P invitation result to hidl control: " MACSTR,
- MAC2STR(bssid));
+ if (bssid) {
+ wpa_printf(
+ MSG_DEBUG,
+ "Notifying P2P invitation result to hidl control: " MACSTR,
+ MAC2STR(bssid));
+ } else {
+ wpa_printf(
+ MSG_DEBUG,
+ "Notifying P2P invitation result to hidl control: NULL bssid");
+ }
HidlManager *hidl_manager = HidlManager::getInstance();
if (!hidl_manager)
diff --git a/wpa_supplicant/hidl/1.0/hidl_manager.cpp b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
index 72b53a4..622dcbf 100644
--- a/wpa_supplicant/hidl/1.0/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
@@ -1256,7 +1256,7 @@
void HidlManager::notifyP2pInvitationResult(
struct wpa_supplicant *wpa_s, int status, const u8 *bssid)
{
- if (!wpa_s || !bssid)
+ if (!wpa_s)
return;
if (p2p_iface_object_map_.find(wpa_s->ifname) ==
@@ -1267,7 +1267,7 @@
wpa_s->ifname,
std::bind(
&ISupplicantP2pIfaceCallback::onInvitationResult,
- std::placeholders::_1, bssid,
+ std::placeholders::_1, bssid ? bssid : kZeroBssid,
static_cast<ISupplicantP2pIfaceCallback::P2pStatusCode>(
status)));
}