Merge "Revert "Revert "Update for libbase."""android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soong

5 files changed, 31 insertions, 18 deletions

diff --git a/server/Android.mk b/server/Android.mk
index 35e34f55..b3a9a413 100644
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -37,6 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
         libnetutils \
         libnl \
         libsysutils \
+        libbase \
         libutils \
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 6855bdf7..76f5e05d 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -19,14 +19,18 @@
 #include <malloc.h>
 
 #define LOG_TAG "InterfaceController"
+#include <base/file.h>
+#include <base/stringprintf.h>
 #include <cutils/log.h>
 #include <logwrap/logwrap.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 
 #include "InterfaceController.h"
 #include "RouteController.h"
 
+using android::base::ReadFileToString;
+using android::base::StringPrintf;
+using android::base::WriteStringToFile;
+
 const char ipv6_proc_path[] = "/proc/sys/net/ipv6/conf";
 
 const char sys_net_path[] = "/sys/class/net";
@@ -55,8 +59,8 @@ int InterfaceController::writeIPv6ProcPath(const char *interface, const char *se
 		errno = ENOENT;
 		return -1;
 	}
-	std::string path(android::StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting));
-	return android::WriteStringToFile(value, path);
+	std::string path(StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting));
+	return WriteStringToFile(value, path);
 }
 
 int InterfaceController::setEnableIPv6(const char *interface, const int on) {
@@ -133,7 +137,7 @@ void InterfaceController::setAcceptRA(const char *value) {
 //             ID to get the table. If it's set to -1000, routes from interface ID 5 will go into
 //             table 1005, etc.
 void InterfaceController::setAcceptRARouteTable(int tableOrOffset) {
-	std::string value(android::StringPrintf("%d", tableOrOffset));
+	std::string value(StringPrintf("%d", tableOrOffset));
 	setOnAllInterfaces("accept_ra_rt_table", value.c_str());
 }
 
@@ -143,8 +147,8 @@ int InterfaceController::setMtu(const char *interface, const char *mtu)
 		errno = ENOENT;
 		return -1;
 	}
-	std::string path(android::StringPrintf("%s/%s/mtu", sys_net_path, interface));
-	return android::WriteStringToFile(mtu, path);
+	std::string path(StringPrintf("%s/%s/mtu", sys_net_path, interface));
+	return WriteStringToFile(mtu, path);
 }
 
 void InterfaceController::setIPv6OptimisticMode(const char *value) {
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index b47acd4a..736aa740 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -30,12 +30,14 @@
 #include "Fwmark.h"
 #include "UidRanges.h"
 
+#include "base/file.h"
 #define LOG_TAG "Netd"
 #include "log/log.h"
 #include "logwrap/logwrap.h"
-#include "utils/file.h"
 #include "resolv_netid.h"
 
+using android::base::WriteStringToFile;
+
 namespace {
 
 // BEGIN CONSTANTS --------------------------------------------------------------------------------
@@ -164,7 +166,7 @@ void updateTableNamesFile() {
         addTableName(entry.second, entry.first, &contents);
     }
 
-    if (!android::WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
+    if (!WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
         ALOGE("failed to write to %s (%s)", RT_TABLES_PATH, strerror(errno));
         return;
     }
diff --git a/server/SoftapController.cpp b/server/SoftapController.cpp
index 0759bde7..c1db1fcf 100644
--- a/server/SoftapController.cpp
+++ b/server/SoftapController.cpp
@@ -34,16 +34,19 @@
 #include <openssl/sha.h>
 
 #define LOG_TAG "SoftapController"
+#include <base/file.h>
+#include <base/stringprintf.h>
 #include <cutils/log.h>
 #include <netutils/ifc.h>
 #include <private/android_filesystem_config.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include "wifi.h"
 #include "ResponseCode.h"
 
 #include "SoftapController.h"
 
+using android::base::StringPrintf;
+using android::base::WriteStringToFile;
+
 static const char HOSTAPD_CONF_FILE[]    = "/data/misc/wifi/hostapd.conf";
 static const char HOSTAPD_BIN_FILE[]    = "/system/bin/hostapd";
 
@@ -136,7 +139,7 @@ int SoftapController::setSoftap(int argc, char *argv[]) {
             channel = AP_CHANNEL_DEFAULT;
     }
 
-    std::string wbuf(android::StringPrintf("interface=%s\n"
+    std::string wbuf(StringPrintf("interface=%s\n"
             "driver=nl80211\n"
             "ctrl_interface=/data/misc/wifi/hostapd\n"
             "ssid=%s\n"
@@ -152,10 +155,10 @@ int SoftapController::setSoftap(int argc, char *argv[]) {
         char psk_str[2*SHA256_DIGEST_LENGTH+1];
         if (!strcmp(argv[6], "wpa-psk")) {
             generatePsk(argv[3], argv[7], psk_str);
-            fbuf = android::StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+            fbuf = StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
         } else if (!strcmp(argv[6], "wpa2-psk")) {
             generatePsk(argv[3], argv[7], psk_str);
-            fbuf = android::StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+            fbuf = StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
         } else if (!strcmp(argv[6], "open")) {
             fbuf = wbuf;
         }
@@ -167,7 +170,7 @@ int SoftapController::setSoftap(int argc, char *argv[]) {
         fbuf = wbuf;
     }
 
-    if (!android::WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
+    if (!WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
         ALOGE("Cannot write to \"%s\": %s", HOSTAPD_CONF_FILE, strerror(errno));
         return ResponseCode::OperationFailed;
     }
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index c9a93fd6..44c7e35a 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -27,16 +27,19 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <base/file.h>
 #define LOG_TAG "TetherController"
 #include <cutils/log.h>
 #include <cutils/properties.h>
-#include <utils/file.h>
 
 #include "Fwmark.h"
 #include "NetdConstants.h"
 #include "Permission.h"
 #include "TetherController.h"
 
+using android::base::ReadFileToString;
+using android::base::WriteStringToFile;
+
 TetherController::TetherController() {
     mInterfaces = new InterfaceCollection();
     mDnsNetId = 0;
@@ -67,7 +70,7 @@ int TetherController::setIpFwdEnabled(bool enable) {
         return 0;
     }
 
-    if (!android::WriteStringToFile(enable ? "1" : "0", "/proc/sys/net/ipv4/ip_forward")) {
+    if (!WriteStringToFile(enable ? "1" : "0", "/proc/sys/net/ipv4/ip_forward")) {
         ALOGE("Failed to write ip_forward (%s)", strerror(errno));
         return -1;
     }
@@ -77,7 +80,7 @@ int TetherController::setIpFwdEnabled(bool enable) {
 
 bool TetherController::getIpFwdEnabled() {
     std::string enabled;
-    if (!android::ReadFileToString("/proc/sys/net/ipv4/ip_forward", &enabled)) {
+    if (!ReadFileToString("/proc/sys/net/ipv4/ip_forward", &enabled)) {
         ALOGE("Failed to read ip_forward (%s)", strerror(errno));
         return -1;
     }