commit 43e72433fd2115b4213b5db06568ebd1c550e7d1
author Andreas Gampe <agampe@google.com> Tue May 14 16:15:24 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu May 16 01:00:21 2019 +0000
tree 32b71a387354aaa09cbc07a146fc6f16a0eb6882
parent 391be3ab96ebe8d9cc00849a3bb8058708416000

ART: Remove file_utils' ReadFileToString

Replace with libbase.

Test: mmma art
Change-Id: Id042f4879485e743e3dc7548434be1634370ee66

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index d6fce6a..1ad5b7e 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -35,6 +35,7 @@
 #include <list>
 #include <sstream>
 
+#include "android-base/file.h"
 #include "android-base/stringprintf.h"
 #include "android-base/strings.h"
 
@@ -1773,7 +1774,8 @@
   // 1:cpuacct,cpu:/
   // We want the third field from the line whose second field contains the "cpu" token.
   std::string cgroup_file;
-  if (!ReadFileToString(StringPrintf("/proc/self/task/%d/cgroup", tid), &cgroup_file)) {
+  if (!android::base::ReadFileToString(StringPrintf("/proc/self/task/%d/cgroup", tid),
+                                       &cgroup_file)) {
     return "";
   }
   std::vector<std::string> cgroup_lines;
@@ -1898,7 +1900,8 @@
 
   // Grab the scheduler stats for this thread.
   std::string scheduler_stats;
-  if (ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid), &scheduler_stats)
+  if (android::base::ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid),
+                                      &scheduler_stats)
       && !scheduler_stats.empty()) {
     scheduler_stats = android::base::Trim(scheduler_stats);  // Lose the trailing '\n'.
   } else {