Revert "Revert "Update for libbase.""
This reverts commit 4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
(cherry picked from commit 3e87c785434fdfed2fb00496cb391c411a426bdd)
Change-Id: I042f485f3cc84206766298853491ddd26dbba13f
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 6855bdf..ea7afb2 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -19,14 +19,17 @@
#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::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 +58,8 @@
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 +136,7 @@
// 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 +146,8 @@
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) {