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

Commit 7210b285 authored by Devika Krishnadas's avatar Devika Krishnadas Committed by Gerrit Code Review
Browse files

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

This reverts commit 8b95a124.

Reason for revert: DroidMonitor: Test failure

Change-Id: I09230ea7c3b80e1b4d277d3c6c6355a38f7bbc92
parent 8b95a124

libutils/include/utils/String16.h

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

libutils/include/utils/String8.h

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

};