commit 139e20dbb6486bf16247b971092d6e6323233a7d
author Mark Salyzyn <salyzyn@google.com> Wed Aug 19 13:53:20 2015 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Aug 20 10:25:57 2015 -0700
tree 6c47cf055178448d7c5f847ce961545d65d65bc3
parent c56394fc2caf230fff06829a575b4be9e72aec9e

logd: white and black switch to std::string

Bug: 23350706
Change-Id: I92f21aee0a9702f63e8465851d0f35007b0469a7

logd/Android.mk

diff --git a/logd/Android.mk b/logd/Android.mk
index 615d030..3866091 100644
--- a/logd/Android.mk
+++ b/logd/Android.mk
@@ -25,7 +25,8 @@
     libsysutils \
     liblog \
     libcutils \
-    libutils
+    libutils \
+    libbase
 
 # This is what we want to do:
 #  event_logtags = $(shell \

logd/LogWhiteBlackList.cpp

diff --git a/logd/LogWhiteBlackList.cpp b/logd/LogWhiteBlackList.cpp
index 16dd6d2..0406bf3 100644
--- a/logd/LogWhiteBlackList.cpp
+++ b/logd/LogWhiteBlackList.cpp
@@ -16,7 +16,9 @@
 
 #include <ctype.h>
 
-#include <utils/String8.h>
+#include <string>
+
+#include <base/stringprintf.h>
 
 #include "LogWhiteBlackList.h"
 
@@ -176,10 +178,10 @@
     static const char nice_format[] = " %s";
     const char *fmt = nice_format + 1;
 
-    android::String8 string;
+    std::string string;
 
     if (mWorstUidEnabled) {
-        string.setTo("~!");
+        string = "~!";
         fmt = nice_format;
     }
 
@@ -189,7 +191,7 @@
         char *a = NULL;
         (*it).format(&a);
 
-        string.appendFormat(fmt, a);
+        string += android::base::StringPrintf(fmt, a);
         fmt = nice_format;
 
         free(a);
@@ -201,13 +203,13 @@
         char *a = NULL;
         (*it).format(&a);
 
-        string.appendFormat(fmt, a);
+        string += android::base::StringPrintf(fmt, a);
         fmt = naughty_format;
 
         free(a);
     }
 
-    *strp = strdup(string.string());
+    *strp = strdup(string.c_str());
 }
 
 // ToDo: Lists are in sorted order, Prune->cmp() returns + or -