commit 28ccfef0f9f87a74086e9bc70b3e8228f32f5ccb
author Nathan Harold <nharold@google.com> Fri Mar 16 19:02:47 2018 -0700
committer Nathan Harold <nharold@google.com> Fri Mar 16 20:54:34 2018 -0700
tree 6ff607cd8e519e03f25e74938e352879d9d498c7
parent 84fde8c5bf02e50bc2f210f63a2069cd0815db28

Convert from toBinderStatus() to asBinderStatus()

There is already an asBinderStatus in
netdutils::Status. It seems that toBinderStatus is
identical save that the Status object is byval.

Bug: 8675309
Test: compilation
Change-Id: Ib7f4a267a12eca16538c3239b7a878c244aa35c6

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 31a87dc..59e8e15 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -54,13 +54,6 @@
 const char NETWORK_STACK[] = "android.permission.NETWORK_STACK";
 const char DUMP[] = "android.permission.DUMP";
 
-binder::Status toBinderStatus(const netdutils::Status s) {
-    if (isOk(s)) {
-        return binder::Status::ok();
-    }
-    return binder::Status::fromServiceSpecificError(s.code(), s.msg().c_str());
-}
-
 binder::Status checkPermission(const char *permission) {
     pid_t pid;
     uid_t uid;
@@ -359,7 +352,7 @@
 
     const auto& statsList = gCtls->tetherCtrl.getTetherStats();
     if (!isOk(statsList)) {
-        return toBinderStatus(statsList);
+        return asBinderStatus(statsList);
     }
 
     for (const auto& stats : statsList.value()) {
@@ -676,21 +669,21 @@
 binder::Status NetdNativeService::setIPv6AddrGenMode(const std::string& ifName,
                                                      int32_t mode) {
     ENFORCE_PERMISSION(NETWORK_STACK);
-    return toBinderStatus(InterfaceController::setIPv6AddrGenMode(ifName, mode));
+    return asBinderStatus(InterfaceController::setIPv6AddrGenMode(ifName, mode));
 }
 
 binder::Status NetdNativeService::wakeupAddInterface(const std::string& ifName,
                                                      const std::string& prefix, int32_t mark,
                                                      int32_t mask) {
     ENFORCE_PERMISSION(NETWORK_STACK);
-    return toBinderStatus(gCtls->wakeupCtrl.addInterface(ifName, prefix, mark, mask));
+    return asBinderStatus(gCtls->wakeupCtrl.addInterface(ifName, prefix, mark, mask));
 }
 
 binder::Status NetdNativeService::wakeupDelInterface(const std::string& ifName,
                                                      const std::string& prefix, int32_t mark,
                                                      int32_t mask) {
     ENFORCE_PERMISSION(NETWORK_STACK);
-    return toBinderStatus(gCtls->wakeupCtrl.delInterface(ifName, prefix, mark, mask));
+    return asBinderStatus(gCtls->wakeupCtrl.delInterface(ifName, prefix, mark, mask));
 }
 
 binder::Status NetdNativeService::trafficCheckBpfStatsEnable(bool* ret) {