commit 907d4a234da9806cde5169c17236a0501805b70a
author Roshan Pius <rpius@google.com> Thu Oct 27 12:48:12 2016 -0700
committer Roshan Pius <rpius@google.com> Wed Nov 16 14:57:07 2016 -0800
tree 3edcf655ae0530af9f7e37761645ba6438b59c93
parent 3c86852a2e0d9ef8696cf87f2bd0f067862f4e80

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

wifi/1.0/default/wifi_ap_iface.cpp

diff --git a/wifi/1.0/default/wifi_ap_iface.cpp b/wifi/1.0/default/wifi_ap_iface.cpp
index 1b59b18..8c38946 100644
--- a/wifi/1.0/default/wifi_ap_iface.cpp
+++ b/wifi/1.0/default/wifi_ap_iface.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "wifi_ap_iface.h"
-
 #include <android-base/logging.h>
 
+#include "hidl_return_util.h"
+#include "wifi_ap_iface.h"
 #include "wifi_status_util.h"
 
 namespace android {
@@ -25,6 +25,7 @@
 namespace wifi {
 namespace V1_0 {
 namespace implementation {
+using hidl_return_util::validateAndCall;
 
 WifiApIface::WifiApIface(const std::string& ifname,
                          const std::weak_ptr<WifiLegacyHal> legacy_hal)
@@ -35,24 +36,30 @@
   is_valid_ = false;
 }
 
+bool WifiApIface::isValid() {
+  return is_valid_;
+}
+
 Return<void> WifiApIface::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 validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+                         &WifiApIface::getNameInternal,
+                         hidl_status_cb);
 }
 
 Return<void> WifiApIface::getType(getType_cb hidl_status_cb) {
-  if (!is_valid_) {
-    hidl_status_cb(createWifiStatus(WifiStatusCode::ERROR_WIFI_IFACE_INVALID),
-                   IfaceType::AP);
-    return Void();
-  }
-  hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::AP);
-  return Void();
+  return validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+                         &WifiApIface::getTypeInternal,
+                         hidl_status_cb);
+}
+
+std::pair<WifiStatus, std::string> WifiApIface::getNameInternal() {
+  return {createWifiStatus(WifiStatusCode::SUCCESS), ifname_};
+}
+
+std::pair<WifiStatus, IfaceType> WifiApIface::getTypeInternal() {
+  return {createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::AP};
 }
 
 }  // namespace implementation