commit e1c1c9dbfc119892f9b9413fd6efa9bbe2a17897
author Sergio Giro <sgiro@google.com> Wed Sep 30 20:20:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 30 20:20:21 2015 +0000
tree 19735201313c01d1b97e0a4830aae4b15345e923
parent ede51745aeb136bcc947da925101907092f824b4
parent ee241ae076d00e77a3ff891cbecc1b510f34014c

am c559a9b5: am b5a00d6b: am e0453334: Merge "system/core: remove methods returning SharedBuffer in String8, String16"

* commit 'c559a9b52fe79c5be32121f8f82c672a5eac94ef':
  system/core: remove methods returning SharedBuffer in String8, String16

include/utils/String16.h

diff --git a/include/utils/String16.h b/include/utils/String16.h
index b2ab5dc..9a67c7a 100644
--- a/include/utils/String16.h
+++ b/include/utils/String16.h
@@ -65,8 +65,6 @@
     
     inline  const char16_t*     string() const;
     
-            const SharedBuffer* sharedBuffer() const;
-    
             size_t              size() const;
             void                setTo(const String16& other);
             status_t            setTo(const char16_t* other);

include/utils/String8.h

diff --git a/include/utils/String8.h b/include/utils/String8.h
index a8a37db..2a75b98 100644
--- a/include/utils/String8.h
+++ b/include/utils/String8.h
@@ -28,7 +28,6 @@
 
 namespace android {
 
-class SharedBuffer;
 class String16;
 class TextOutput;
 
@@ -69,7 +68,6 @@
     inline  bool                isEmpty() const;
     
             size_t              length() const;
-            const SharedBuffer* sharedBuffer() const;
     
             void                clear();
 

libutils/String16.cpp

diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index 67be9d8..6a5273f 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -171,11 +171,6 @@
     return SharedBuffer::sizeFromData(mString)/sizeof(char16_t)-1;
 }
 
-const SharedBuffer* String16::sharedBuffer() const
-{
-    return SharedBuffer::bufferFromData(mString);
-}
-
 void String16::setTo(const String16& other)
 {
     SharedBuffer::bufferFromData(other.mString)->acquire();

libutils/String8.cpp

diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 4fca2c1..771d312 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -220,11 +220,6 @@
     return SharedBuffer::sizeFromData(mString)-1;
 }
 
-const SharedBuffer* String8::sharedBuffer() const
-{
-    return SharedBuffer::bufferFromData(mString);
-}
-
 String8 String8::format(const char* fmt, ...)
 {
     va_list args;