commit b67219a71d1d896bcb34c4a7a797824b88515b2c
author Dan Albert <danalbert@google.com> Fri Mar 13 22:35:27 2015 -0700
committer Dan Albert <danalbert@google.com> Sat Mar 14 16:53:36 2015 -0700
tree afb5171b6e804b87a0a0aedd0742f36283b3bd64
parent 909757cfc276546652d8f6d433c56d644325af8c

Update for libbase.

StringPrintf and the string based file I/O are being moved to libbase.

Change-Id: I765d9e53f65a76d318d9d0d9503403fc092254d5

server/TetherController.cpp

diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index c9a93fd..44c7e35 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 @@
         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 @@
 
 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;
     }