diff options
| author | Steven Moreland <smoreland@google.com> | 2017-03-10 22:31:08 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-03-10 22:51:55 -0800 |
| commit | 2aac33512825f958fdbd0c0a2fd2651a6d779d24 (patch) | |
| tree | 12df01735daed83c2747f0a7b8d0dab2a06e1d2c /healthd | |
| parent | c1b3c8ef2629eac2a73aa4a95bf43a66edf4cd0f (diff) | |
| download | system_core-2aac33512825f958fdbd0c0a2fd2651a6d779d24.tar.gz system_core-2aac33512825f958fdbd0c0a2fd2651a6d779d24.tar.bz2 system_core-2aac33512825f958fdbd0c0a2fd2651a6d779d24.zip | |
libutils: String\d+ make std_string private
This method is still used by prebuilts, but making it private to start
the process of removing it from everywhere.
Test: pass
Bug: 35363681
Change-Id: I4d53f68d10c9abcca32023c4d930e99912afa697
Diffstat (limited to 'healthd')
| -rw-r--r-- | healthd/BatteryMonitor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 0c90a5456..45b6edaf2 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -129,7 +129,7 @@ int BatteryMonitor::getBatteryHealth(const char* status) { } int BatteryMonitor::readFromFile(const String8& path, std::string* buf) { - if (android::base::ReadFileToString(String8::std_string(path), buf)) { + if (android::base::ReadFileToString(path.c_str(), buf)) { *buf = android::base::Trim(*buf); } return buf->length(); |