Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80738a1e authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Implement String8|16::empty and String16::length" into main am: 9578c774 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822



Change-Id: If14f11f1ec862554e698f443195751b8a997eba9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ba37981 9578c774

libutils/include/utils/String16.h

+14 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ private: 
    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 @@ inline std::string String16::std_string(const String16& str) 
    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);

libutils/include/utils/String8.h

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public: 


    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 @@ inline size_t String8::size() const 
    return length();

}



inline bool String8::empty() const

{

    return length() == 0;

}



inline bool String8::isEmpty() const

{

    return length() == 0;