commit bc08faba8d6e0c9601b56b42d144c3f3002a6e9c
author Glen Kuhne <kuh@google.com> Fri Apr 28 13:03:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 13:03:34 2017 +0000
tree 81f0c11085ef3f90eb5f842bc077c63e2330c4d2
parent 89c50e592ef67536ae6923508ca9d17017b7f72c
parent e45c672031bdfeebf07ac39f020a356643ca3403

Merge "Fix hidl p2p network register & notifyStaApAuth" into oc-dev
am: e45c672031

Change-Id: Id96baab3cfe7c10f478c53c97530f565c1c27c81

wpa_supplicant/hidl/hidl_manager.cpp

diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index 727af57..15f4111 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/hidl_manager.cpp
@@ -1323,15 +1323,14 @@
 void HidlManager::notifyApStaAuthorized(
     struct wpa_supplicant *wpa_s, const u8 *sta, const u8 *p2p_dev_addr)
 {
-	if (!wpa_s || !sta || !p2p_dev_addr)
+	if (!wpa_s || !wpa_s->parent || !sta || !p2p_dev_addr)
 		return;
-
-	if (p2p_iface_object_map_.find(wpa_s->ifname) ==
+	if (p2p_iface_object_map_.find(wpa_s->parent->ifname) ==
 	    p2p_iface_object_map_.end())
 		return;
 
 	callWithEachP2pIfaceCallback(
-	    wpa_s->ifname, std::bind(
+	    wpa_s->parent->ifname, std::bind(
 			       &ISupplicantP2pIfaceCallback::onStaAuthorized,
 			       std::placeholders::_1, sta, p2p_dev_addr));
 }
@@ -1339,15 +1338,14 @@
 void HidlManager::notifyApStaDeauthorized(
     struct wpa_supplicant *wpa_s, const u8 *sta, const u8 *p2p_dev_addr)
 {
-	if (!wpa_s || !sta || !p2p_dev_addr)
+	if (!wpa_s || !wpa_s->parent || !sta || !p2p_dev_addr)
 		return;
-
-	if (p2p_iface_object_map_.find(wpa_s->ifname) ==
+	if (p2p_iface_object_map_.find(wpa_s->parent->ifname) ==
 	    p2p_iface_object_map_.end())
 		return;
 
 	callWithEachP2pIfaceCallback(
-	    wpa_s->ifname, std::bind(
+	    wpa_s->parent->ifname, std::bind(
 			       &ISupplicantP2pIfaceCallback::onStaDeauthorized,
 			       std::placeholders::_1, sta, p2p_dev_addr));
 }

wpa_supplicant/notify.c

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index faf71d5..c720c32 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -364,6 +364,7 @@
 {
 #ifdef CONFIG_P2P
 	wpas_dbus_register_persistent_group(wpa_s, ssid);
+	wpas_hidl_register_network(wpa_s, ssid);
 #endif /* CONFIG_P2P */
 }
 
@@ -373,6 +374,7 @@
 {
 #ifdef CONFIG_P2P
 	wpas_dbus_unregister_persistent_group(wpa_s, ssid->id);
+	wpas_hidl_unregister_network(wpa_s, ssid);
 #endif /* CONFIG_P2P */
 }