wifi: Make methods deliver status synchronously (3/3)
Make all the |IWifiIface|/|IWifiRttController| HIDL interface
methods return a synchronous status code. Change from using the event
callbacks to the synchronous callbacks for delivering status.
While there,
Use the default std::string to hidl_string constructor in status
callbacks.
Bug: 32056230
Bug: 32061909
Test: Compiles
Change-Id: Ifa06a11afb085bfd6684f7b997fb730d192018ea
diff --git a/wifi/1.0/default/wifi_p2p_iface.cpp b/wifi/1.0/default/wifi_p2p_iface.cpp
index 349a158..9ffb48c 100644
--- a/wifi/1.0/default/wifi_p2p_iface.cpp
+++ b/wifi/1.0/default/wifi_p2p_iface.cpp
@@ -18,7 +18,7 @@
#include <android-base/logging.h>
-#include "failure_reason_util.h"
+#include "wifi_status_util.h"
namespace android {
namespace hardware {
@@ -35,15 +35,24 @@
is_valid_ = false;
}
-Return<void> WifiP2pIface::getName(getName_cb cb) {
- hidl_string hidl_ifname;
- hidl_ifname.setToExternal(ifname_.c_str(), ifname_.size());
- cb(hidl_ifname);
+Return<void> WifiP2pIface::getName(getName_cb hidl_status_cb) {
+ if (!is_valid_) {
+ hidl_status_cb(createWifiStatus(WifiStatusCode::ERROR_WIFI_IFACE_INVALID),
+ hidl_string());
+ return Void();
+ }
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS), ifname_);
return Void();
}
-Return<IfaceType> WifiP2pIface::getType() {
- return IfaceType::P2P;
+Return<void> WifiP2pIface::getType(getType_cb hidl_status_cb) {
+ if (!is_valid_) {
+ hidl_status_cb(createWifiStatus(WifiStatusCode::ERROR_WIFI_IFACE_INVALID),
+ IfaceType::P2P);
+ return Void();
+ }
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::P2P);
+ return Void();
}
} // namespace implementation