ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libutils: String\d+ make std_string private"

Browse source
This commit is contained in:
Treehugger Robot 2017-03-11 08:55:09 +00:00 • committed by Gerrit Code Review
commit 76850afa52
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
healthd/BatteryMonitor.cpp
View file

@ -129,7 +129,7 @@ int BatteryMonitor::getBatteryHealth(const char* status) {
} }
int BatteryMonitor::readFromFile(const String8& path, std::string* buf) { 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); *buf = android::base::Trim(*buf);
} }
return buf->length(); return buf->length();

3
libutils/include/utils/String16.h
View file

@ -67,7 +67,10 @@ public:
inline const char16_t* string() const; inline const char16_t* string() const;
//TODO(b/35363681): remove
private:
static inline std::string std_string(const String16& str); static inline std::string std_string(const String16& str);
public:
size_t size() const; size_t size() const;
void setTo(const String16& other); void setTo(const String16& other);
status_t setTo(const char16_t* other); status_t setTo(const char16_t* other);

10
libutils/include/utils/String8.h
View file

@ -64,8 +64,14 @@ public:
static String8 format(const char* fmt, ...) __attribute__((format (printf, 1, 2))); static String8 format(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
static String8 formatV(const char* fmt, va_list args); static String8 formatV(const char* fmt, va_list args);
inline const char* c_str() const;
inline const char* string() const; inline const char* string() const;
// TODO(b/35363681): remove
private:
static inline std::string std_string(const String8& str); static inline std::string std_string(const String8& str);
public:
inline size_t size() const; inline size_t size() const;
inline size_t bytes() const; inline size_t bytes() const;
inline bool isEmpty() const; inline bool isEmpty() const;
@ -259,6 +265,10 @@ inline const String8 String8::empty() {
return String8(); return String8();
} }
inline const char* String8::c_str() const
{
return mString;
}
inline const char* String8::string() const inline const char* String8::string() const
{ {
return mString; return mString;