commit 2cccdfa9cc5854c9e681a367a38855dfebeddf7c
author Roshan Pius <rpius@google.com> Fri Feb 10 00:57:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 00:57:49 2017 +0000
tree f07bd8556f78647fe1edb49397b15b4dac4d6839
parent cdbc741d90fe8a073ac8bbe12c112d0f3598192b
parent b0a95cb1591d27949710c40f3467851c61902062

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

Change-Id: I32135e574e1b4e6a7284a163c208bfa1b2e969f0

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");
+		}
 	}
 }