commit b2b037d9f05eaef2c09fdd8ec905d75dc7ac2644
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Sep 08 19:59:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 08 19:59:48 2023 +0000
tree 77f9394715d6db9d327e8b1bd22ec82db5f939b3
parent 9cbae9d75bcb531a12d0a5b23088f396091690cd
parent 4b6a7c3940bc6d5e89e15179d8d49600e6dd4857

Merge "Revert "Revert "Drop all path-related methods from android::String8""" into main

libutils/include/utils/String16.h

diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h
index b48b907..ec2a324 100644
--- a/libutils/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
@@ -56,9 +56,6 @@
     inline  const char16_t*     c_str() const;
     inline  const char16_t*     string() const;
 
-private:
-    static inline std::string   std_string(const String16& str);
-public:
             size_t              size() const;
     inline  bool                empty() const;
 
@@ -249,11 +246,6 @@
     return mString;
 }
 
-inline std::string String16::std_string(const String16& str)
-{
-    return std::string(String8(str).c_str());
-}
-
 inline bool String16::empty() const
 {
     return length() == 0;

libutils/include/utils/String8.h

diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h
index fbb0a0a..928e943 100644
--- a/libutils/include/utils/String8.h
+++ b/libutils/include/utils/String8.h
@@ -58,10 +58,6 @@
     inline  const char*         c_str() const;
     inline  const char*         string() const;
 
-private:
-    static inline std::string   std_string(const String8& str);
-public:
-
     inline  size_t              size() const;
     inline  size_t              bytes() const;
     inline  bool                empty() const;
@@ -170,11 +166,6 @@
     return mString;
 }
 
-inline std::string String8::std_string(const String8& str)
-{
-    return std::string(str.c_str());
-}
-
 inline size_t String8::size() const
 {
     return length();