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

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

Merge "Revert "Revert "Lock down String8|16.string() usage""" into main am:... 

Merge "Revert "Revert "Lock down String8|16.string() usage""" into main am: 8c9c7d07 am: 8703cb8e am: 80ce21e6 am: d4d78d41 am: 3215825c

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



Change-Id: I09add7b55b1c3401ce0f45a88fde29f1e1e9301d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3599a091 3215825c

libutils/include/utils/String16.h

+8 −1
Original line number Diff line number Diff line
@@ -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_STRING16_OBSOLETE_METHODS

public:

#else

private:

#endif

    inline  const char16_t*     string() const;

};



// String16 can be trivially moved using memcpy() because moving does not

libutils/include/utils/String8.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};