Merge "Implement String8|16::empty and String16::length" into main am: 9578c774a9 am: 80738a1e0b am: 3cca1adac9 am: 51115c6d18
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822
Change-Id: I67383aee64e52ea9f1b3c68801bd112ea74c4440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h
index d719aea..b48b907 100644
--- a/libutils/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
@@ -60,6 +60,10 @@
static inline std::string std_string(const String16& str);
public:
size_t size() const;
+ inline bool empty() const;
+
+ inline size_t length() const;
+
void setTo(const String16& other);
status_t setTo(const char16_t* other);
status_t setTo(const char16_t* other, size_t len);
@@ -250,6 +254,16 @@
return std::string(String8(str).c_str());
}
+inline bool String16::empty() const
+{
+ return length() == 0;
+}
+
+inline size_t String16::length() const
+{
+ return size();
+}
+
inline String16& String16::operator=(const String16& other)
{
setTo(other);
diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h
index a628bb4..ea25c6a 100644
--- a/libutils/include/utils/String8.h
+++ b/libutils/include/utils/String8.h
@@ -64,6 +64,7 @@
inline size_t size() const;
inline size_t bytes() const;
+ inline bool empty() const;
inline bool isEmpty() const;
size_t length() const;
@@ -248,6 +249,11 @@
return length();
}
+inline bool String8::empty() const
+{
+ return length() == 0;
+}
+
inline bool String8::isEmpty() const
{
return length() == 0;