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

Lock down String8|16.string() usage

Browse source 
All users should migrate to .c_str()

Bug: 295394788
Test: make checkbuild
Change-Id: Ic6295848cf3377e0bf5334448d5ed7ea53fae7ae
This commit is contained in:
Tomasz Wasilczyk 2023-08-11 18:43:23 +00:00
parent 358a982b71
commit 8b95a12489
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,6 @@ public:
~String16();
inline const char16_t* c_str() const;
inline const char16_t* string() const;
size_t size() const;
inline bool empty() const;
@ -188,6 +187,14 @@ 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,7 +65,6 @@ 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;
@ -155,6 +154,7 @@ public:
#else
private:
#endif
inline const char* string() const;
inline bool isEmpty() const;
};