wifi: Use hidl_return_util functions in Iface/Rtt
Modify the WifiIface & WifiRttController methods to the use the new helper
functions.
Bug: 32337072
Test: Compiles
Change-Id: I8ce5450f3012ea3ad699db3c780c0bf985492aad
diff --git a/wifi/1.0/default/wifi_rtt_controller.cpp b/wifi/1.0/default/wifi_rtt_controller.cpp
index c0d0a00..b7eab89 100644
--- a/wifi/1.0/default/wifi_rtt_controller.cpp
+++ b/wifi/1.0/default/wifi_rtt_controller.cpp
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#include "wifi_rtt_controller.h"
-
#include <android-base/logging.h>
+#include "hidl_return_util.h"
+#include "wifi_rtt_controller.h"
#include "wifi_status_util.h"
namespace android {
@@ -25,6 +25,7 @@
namespace wifi {
namespace V1_0 {
namespace implementation {
+using hidl_return_util::validateAndCall;
WifiRttController::WifiRttController(
const sp<IWifiIface>& bound_iface,
@@ -36,15 +37,20 @@
is_valid_ = false;
}
+bool WifiRttController::isValid() {
+ return is_valid_;
+}
+
Return<void> WifiRttController::getBoundIface(getBoundIface_cb hidl_status_cb) {
- if (!is_valid_) {
- hidl_status_cb(
- createWifiStatus(WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID),
- nullptr);
- return Void();
- }
- hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS), bound_iface_);
- return Void();
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
+ &WifiRttController::getBoundIfaceInternal,
+ hidl_status_cb);
+}
+
+std::pair<WifiStatus, sp<IWifiIface>>
+WifiRttController::getBoundIfaceInternal() {
+ return {createWifiStatus(WifiStatusCode::SUCCESS), bound_iface_};
}
} // namespace implementation