tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Lock down String8|16.string() usage"

Browse source 
This reverts commit 8b95a12489.

Reason for revert: DroidMonitor: Test failure

Change-Id: I09230ea7c3b80e1b4d277d3c6c6355a38f7bbc92
This commit is contained in:
Devika Krishnadas 2023-09-15 18:46:03 +00:00 committed by Gerrit Code Review
parent 8b95a12489
commit 7210b285c2
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,7 @@ public:
~String16();
inline const char16_t* c_str() const;
inline const char16_t* string() const;
size_t size() const;
inline bool empty() const;
@ -187,14 +188,6 @@ protected:
template <size_t N>
explicit constexpr String16(const StaticData<N>& s) : mString(s.data) {}
// These symbols are for potential backward compatibility with prebuilts. To be removed.
#ifdef ENABLE_STRING8_OBSOLETE_METHODS
public:
#else
private:
#endif
inline const char16_t* string() const;
};
// String16 can be trivially moved using memcpy() because moving does not

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

@ -65,6 +65,7 @@ public:
static String8 formatV(const char* fmt, va_list args);
inline const char* c_str() const;
inline const char* string() const;
inline size_t size() const;
inline size_t bytes() const;
@ -154,7 +155,6 @@ public:
#else
private:
#endif
inline const char* string() const;
inline bool isEmpty() const;
};