commit 1fb9b70891efa9f41c282120d3f5d7bf8d40e331
author Roshan Pius <rpius@google.com> Thu Apr 13 23:56:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 13 23:56:23 2017 +0000
tree 4021583e9431970138dee0c582086fd306107bf6
parent 2c6ce4a219f97dad156bb9897c3fade2f6e52e97
parent 7a1c8485ae3a467debc89ca8477cf6f4b4217f21

wpa_supplicant(hidl): remove unused parameter
am: 7a1c8485ae

Change-Id: I5fd6430cbe22d0113af48c4ccad70f3fc471509a

wpa_supplicant/hidl/hidl.cpp

diff --git a/wpa_supplicant/hidl/hidl.cpp b/wpa_supplicant/hidl/hidl.cpp
index 3acc7e2..1416799 100644
--- a/wpa_supplicant/hidl/hidl.cpp
+++ b/wpa_supplicant/hidl/hidl.cpp
@@ -474,9 +474,9 @@
 
 void wpas_hidl_notify_p2p_group_started(
     struct wpa_supplicant *wpa_s, const struct wpa_ssid *ssid, int persistent,
-    int client, const u8 *ip)
+    int client)
 {
-	if (!wpa_s || !ssid || !ip)
+	if (!wpa_s || !ssid)
 		return;
 
 	wpa_printf(
@@ -487,8 +487,7 @@
 	if (!hidl_manager)
 		return;
 
-	hidl_manager->notifyP2pGroupStarted(
-	    wpa_s, ssid, persistent, client, ip);
+	hidl_manager->notifyP2pGroupStarted(wpa_s, ssid, persistent, client);
 }
 
 void wpas_hidl_notify_p2p_group_removed(

wpa_supplicant/hidl/hidl.h

diff --git a/wpa_supplicant/hidl/hidl.h b/wpa_supplicant/hidl/hidl.h
index 9e2d650..96631f2 100644
--- a/wpa_supplicant/hidl/hidl.h
+++ b/wpa_supplicant/hidl/hidl.h
@@ -71,7 +71,7 @@
     struct wpa_supplicant *wpa_s, const char *reason);
 void wpas_hidl_notify_p2p_group_started(
     struct wpa_supplicant *wpa_s, const struct wpa_ssid *ssid, int persistent,
-    int client, const u8 *ip);
+    int client);
 void wpas_hidl_notify_p2p_group_removed(
     struct wpa_supplicant *wpa_s, const struct wpa_ssid *ssid,
     const char *role);
@@ -177,7 +177,7 @@
 }
 static void wpas_hidl_notify_p2p_group_started(
     struct wpa_supplicant *wpa_s, const struct wpa_ssid *ssid, int persistent,
-    int client, const u8 *ip)
+    int client)
 {
 }
 static void wpas_hidl_notify_p2p_group_removed(

wpa_supplicant/hidl/hidl_manager.cpp

diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index a2eb101..727af57 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/hidl_manager.cpp
@@ -1175,10 +1175,9 @@
 }
 
 void HidlManager::notifyP2pGroupStarted(
-    struct wpa_supplicant *wpa_group_s, const struct wpa_ssid *ssid,
-    int persistent, int client, const u8 *ip)
+    struct wpa_supplicant *wpa_group_s, const struct wpa_ssid *ssid, int persistent, int client)
 {
-	if (!wpa_group_s || !wpa_group_s->parent || !ssid || !ip)
+	if (!wpa_group_s || !wpa_group_s->parent || !ssid)
 		return;
 
 	// For group notifications, need to use the parent iface for callbacks.

wpa_supplicant/hidl/hidl_manager.h

diff --git a/wpa_supplicant/hidl/hidl_manager.h b/wpa_supplicant/hidl/hidl_manager.h
index ada9324..9d9527c 100644
--- a/wpa_supplicant/hidl/hidl_manager.h
+++ b/wpa_supplicant/hidl/hidl_manager.h
@@ -99,7 +99,7 @@
 	    struct wpa_supplicant *wpa_s, const char *reason);
 	void notifyP2pGroupStarted(
 	    struct wpa_supplicant *wpa_group_s, const struct wpa_ssid *ssid,
-	    int persistent, int client, const u8 *ip);
+	    int persistent, int client);
 	void notifyP2pGroupRemoved(
 	    struct wpa_supplicant *wpa_group_s, const struct wpa_ssid *ssid,
 	    const char *role);

wpa_supplicant/notify.c

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index d7adaa0..faf71d5 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -735,7 +735,7 @@
 
 	wpas_dbus_signal_p2p_group_started(wpa_s, client, persistent, ip);
 
-	wpas_hidl_notify_p2p_group_started(wpa_s, ssid, persistent, client, ip);
+	wpas_hidl_notify_p2p_group_started(wpa_s, ssid, persistent, client);
 }