commit e127394ece9893b3bbf74b5875ef0c3dc20e499e
author Roshan Pius <rpius@google.com> Thu Feb 09 23:30:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 09 23:30:01 2017 +0000
tree f07bd8556f78647fe1edb49397b15b4dac4d6839
parent 3e2126d282cae249565b8c4d39bb9c9cee83fb8b
parent 3ec5208794a434b49b0e1c6546460a5ff1ed4cea

Merge "wpa_supplicant(hidl): Add status check for all cb invocation"
am: 3ec5208794

Change-Id: I965de28245bc9e6ad6a66e7d9d7d238f2fbd717c

wpa_supplicant/hidl/hidl_manager.cpp

diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/hidl_manager.cpp
index ee257ee..ed91dbf 100644
--- a/wpa_supplicant/hidl/hidl_manager.cpp
+++ b/wpa_supplicant/hidl/hidl_manager.cpp
@@ -279,7 +279,10 @@
 		return;
 	const auto &iface_callback_list = iface_callback_map_iter->second;
 	for (const auto &callback : iface_callback_list) {
-		method(callback);
+		if (!method(callback).isOk()) {
+			wpa_printf(
+			    MSG_ERROR, "Failed to invoke HIDL iface callback");
+		}
 	}
 }
 
@@ -302,7 +305,11 @@
 		return;
 	const auto &network_callback_list = network_callback_map_iter->second;
 	for (const auto &callback : network_callback_list) {
-		method(callback);
+		if (!method(callback).isOk()) {
+			wpa_printf(
+			    MSG_ERROR,
+			    "Failed to invoke HIDL network callback");
+		}
 	}
 }
 
@@ -1583,7 +1590,9 @@
     const std::function<Return<void>(android::sp<ISupplicantCallback>)> &method)
 {
 	for (const auto &callback : supplicant_callbacks_) {
-		method(callback);
+		if (!method(callback).isOk()) {
+			wpa_printf(MSG_ERROR, "Failed to invoke HIDL callback");
+		}
 	}
 }