diff options
| author | Steven Moreland <smoreland@google.com> | 2017-03-11 09:07:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-11 09:07:23 +0000 |
| commit | aa47993b23aff7d473085d723cbe29ef6e63da08 (patch) | |
| tree | 464b2d6b65be61714f581a17543c26b368856624 /healthd | |
| parent | be09d5b735153f81804f2e29828be3b642c22f8a (diff) | |
| parent | 4ba3f784efb67ebc39aa7591fe8c55df6ba7d1be (diff) | |
| download | system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.tar.gz system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.tar.bz2 system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.zip | |
Merge "libutils: String\d+ make std_string private" am: 76850afa52 am: 2ebb1e5404
am: 4ba3f784ef
Change-Id: I14f003992db222ef285551c6d9a8ffe71620f70d
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 4df0af1f8..d26530bbf 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(); |