commit abce5605ef4923e4881963fd4494e5506563f5c2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 19 15:56:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 19 15:56:32 2019 +0000
tree 4168513f83093fcf3ff63842db955ff1e94110cd
parent 23ee665b996d56e8409360d1b7ef335290dad416
parent 330ffd607c61c8e98a92e758b2e1e166aefb5cac

Merge "[DPP] Replace HAL interface onSuccess with onSuccessConfigSent"

wpa_supplicant/hidl/1.2/hidl.cpp

diff --git a/wpa_supplicant/hidl/1.2/hidl.cpp b/wpa_supplicant/hidl/1.2/hidl.cpp
index d8fa82f..ea1fa98 100644
--- a/wpa_supplicant/hidl/1.2/hidl.cpp
+++ b/wpa_supplicant/hidl/1.2/hidl.cpp
@@ -27,7 +27,6 @@
 using android::hardware::wifi::supplicant::V1_2::implementation::HidlManager;
 using namespace android::hardware::wifi::supplicant::V1_2;
 
-static void wpas_hidl_notify_dpp_success(struct wpa_supplicant *wpa_s, DppSuccessCode code);
 static void wpas_hidl_notify_dpp_failure(struct wpa_supplicant *wpa_s, DppFailureCode code);
 static void wpas_hidl_notify_dpp_progress(struct wpa_supplicant *wpa_s, DppProgressCode code);
 
@@ -670,7 +669,15 @@
 	if (!wpa_s)
 		return;
 
-	wpas_hidl_notify_dpp_success(wpa_s, DppSuccessCode::CONFIGURATION_SENT);
+	wpa_printf(
+	    MSG_DEBUG,
+	    "Notifying DPP configuration sent");
+
+	HidlManager *hidl_manager = HidlManager::getInstance();
+	if (!hidl_manager)
+		return;
+
+	hidl_manager->notifyDppConfigSent(wpa_s);
 }
 
 /* DPP Progress notifications */
@@ -738,22 +745,6 @@
 }
 
 /* DPP notification helper functions */
-static void wpas_hidl_notify_dpp_success(struct wpa_supplicant *wpa_s, DppSuccessCode code)
-{
-	if (!wpa_s)
-		return;
-
-	wpa_printf(
-	    MSG_DEBUG,
-	    "Notifying DPP success event %d", code);
-
-	HidlManager *hidl_manager = HidlManager::getInstance();
-	if (!hidl_manager)
-		return;
-
-	hidl_manager->notifyDppSuccess(wpa_s, code);
-}
-
 static void wpas_hidl_notify_dpp_failure(struct wpa_supplicant *wpa_s, DppFailureCode code)
 {
 	if (!wpa_s)

wpa_supplicant/hidl/1.2/hidl_manager.cpp

diff --git a/wpa_supplicant/hidl/1.2/hidl_manager.cpp b/wpa_supplicant/hidl/1.2/hidl_manager.cpp
index 8297c03..b69fe04 100644
--- a/wpa_supplicant/hidl/1.2/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/1.2/hidl_manager.cpp
@@ -1486,7 +1486,7 @@
 }
 
 /**
- * Notify listener about a new DPP configuration success event
+ * Notify listener about a new DPP configuration received success event
  *
  * @param ifname Interface name
  * @param config Configuration object
@@ -1526,18 +1526,17 @@
 }
 
 /**
- * Notify listener about a DPP success event
+ * Notify listener about a DPP configuration sent success event
  *
  * @param ifname Interface name
- * @param code Status code
  */
-void HidlManager::notifyDppSuccess(struct wpa_supplicant *wpa_s, DppSuccessCode code)
+void HidlManager::notifyDppConfigSent(struct wpa_supplicant *wpa_s)
 {
 	std::string hidl_ifname = wpa_s->ifname;
 
 	callWithEachStaIfaceCallback_1_2(hidl_ifname,
-			std::bind(&V1_2::ISupplicantStaIfaceCallback::onDppSuccess,
-					std::placeholders::_1, code));
+			std::bind(&V1_2::ISupplicantStaIfaceCallback::onDppSuccessConfigSent,
+					std::placeholders::_1));
 }
 
 /**

wpa_supplicant/hidl/1.2/hidl_manager.h

diff --git a/wpa_supplicant/hidl/1.2/hidl_manager.h b/wpa_supplicant/hidl/1.2/hidl_manager.h
index 7291347..910e2bf 100644
--- a/wpa_supplicant/hidl/1.2/hidl_manager.h
+++ b/wpa_supplicant/hidl/1.2/hidl_manager.h
@@ -130,7 +130,7 @@
 	void notifyEapError(struct wpa_supplicant *wpa_s, int error_code);
 	void notifyDppConfigReceived(struct wpa_supplicant *wpa_s,
 			struct wpa_ssid *config);
-	void notifyDppSuccess(struct wpa_supplicant *wpa_s, DppSuccessCode code);
+	void notifyDppConfigSent(struct wpa_supplicant *wpa_s);
 	void notifyDppFailure(struct wpa_supplicant *wpa_s, DppFailureCode code);
 	void notifyDppProgress(struct wpa_supplicant *wpa_s, DppProgressCode code);