commit 38e51f1a88fcec495b91a5e18148121b9bc666ad
author Erik Kline <ek@google.com> Thu Sep 06 20:14:44 2018 +0900
committer Erik Kline <ek@google.com> Tue Sep 11 17:17:54 2018 +0900
tree 29ef7a42dd9a91d176abf06bb16dec064ffdc7a6
parent 94090052df4ba99f5e9133afb48ccf08a7244c32

Implement INetd.aidl getProcSysNet().

Also: a few "tidy-inspired" changes.

Test: as follows
    - built, flashed, booted
    - system/netd/tests/runtest.sh passes
Bug: 32163131
Change-Id: Icaa164af3c3d0d03af1ec083dfcbe856ac51529f

server/InterfaceController.cpp

diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 34b8004..4c35085 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -26,6 +26,7 @@
 #include <android-base/file.h>
 #include <android-base/properties.h>
 #include <android-base/stringprintf.h>
+#include <android-base/strings.h>
 #include <log/log.h>
 #include <logwrap/logwrap.h>
 #include <netutils/ifc.h>
@@ -40,17 +41,18 @@
 
 using android::base::ReadFileToString;
 using android::base::StringPrintf;
+using android::base::Trim;
 using android::base::WriteStringToFile;
 using android::net::INetd;
 using android::net::RouteController;
 using android::netdutils::isOk;
-using android::netdutils::Status;
-using android::netdutils::StatusOr;
 using android::netdutils::makeSlice;
 using android::netdutils::sSyscalls;
-using android::netdutils::status::ok;
+using android::netdutils::Status;
 using android::netdutils::statusFromErrno;
+using android::netdutils::StatusOr;
 using android::netdutils::toString;
+using android::netdutils::status::ok;
 
 namespace {
 
@@ -380,7 +382,11 @@
     if (path.empty()) {
         return -errno;
     }
-    return ReadFileToString(path, value) ? 0 : -errno;
+    if (ReadFileToString(path, value)) {
+        *value = Trim(*value);
+        return 0;
+    }
+    return -errno;
 }
 
 int InterfaceController::setParameter(