commit 4a0ab5ff4a87cfc4a987da99546b01e44875a2e5
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 10:28:37 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 10:28:37 2015 +0000
tree 2e6faf54c6782b6355feca6b43faab1633c91b43
parent b67219a71d1d896bcb34c4a7a797824b88515b2c

Revert "Update for libbase."

Breaks internal master.

This reverts commit b67219a71d1d896bcb34c4a7a797824b88515b2c.

Change-Id: I43145f0724ad2d669b65d20b6fd6ccc44b8f0a4f

server/SoftapController.cpp

diff --git a/server/SoftapController.cpp b/server/SoftapController.cpp
index c1db1fc..0759bde 100644
--- a/server/SoftapController.cpp
+++ b/server/SoftapController.cpp
@@ -34,19 +34,16 @@
 #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";
 
@@ -139,7 +136,7 @@
             channel = AP_CHANNEL_DEFAULT;
     }
 
-    std::string wbuf(StringPrintf("interface=%s\n"
+    std::string wbuf(android::StringPrintf("interface=%s\n"
             "driver=nl80211\n"
             "ctrl_interface=/data/misc/wifi/hostapd\n"
             "ssid=%s\n"
@@ -155,10 +152,10 @@
         char psk_str[2*SHA256_DIGEST_LENGTH+1];
         if (!strcmp(argv[6], "wpa-psk")) {
             generatePsk(argv[3], argv[7], psk_str);
-            fbuf = StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+            fbuf = android::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 = StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+            fbuf = android::StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
         } else if (!strcmp(argv[6], "open")) {
             fbuf = wbuf;
         }
@@ -170,7 +167,7 @@
         fbuf = wbuf;
     }
 
-    if (!WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
+    if (!android::WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
         ALOGE("Cannot write to \"%s\": %s", HOSTAPD_CONF_FILE, strerror(errno));
         return ResponseCode::OperationFailed;
     }