summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2015-09-30 15:21:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-09-30 15:21:48 +0000
commite045333445ab3ebb8d602d25ed750169f135baa6 (patch)
tree9f0af28c06f5da7504d6c9aff3cba2b974fe3bad
parent730fdbb1ca4c39a4d69868f7a261b023f2bea296 (diff)
parent282efae9c3d14ca2641e5fea223cb1be204feff1 (diff)
Merge "system/core: remove methods returning SharedBuffer in String8, String16"
-rw-r--r--include/utils/String16.h2
-rw-r--r--include/utils/String8.h2
-rw-r--r--libutils/String16.cpp5
-rw-r--r--libutils/String8.cpp5
4 files changed, 0 insertions, 14 deletions
diff --git a/include/utils/String16.h b/include/utils/String16.h
index b2ab5dc11..9a67c7a5f 100644
--- a/include/utils/String16.h
+++ b/include/utils/String16.h
@@ -65,8 +65,6 @@ public:
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);
diff --git a/include/utils/String8.h b/include/utils/String8.h
index a8a37db21..2a75b9886 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 @@ public:
inline bool isEmpty() const;
size_t length() const;
- const SharedBuffer* sharedBuffer() const;
void clear();
diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index 67be9d8fa..6a5273ff2 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -171,11 +171,6 @@ size_t String16::size() const
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();
diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 5e8552049..81bfccf79 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -217,11 +217,6 @@ size_t String8::length() const
return SharedBuffer::sizeFromData(mString)-1;
}
-const SharedBuffer* String8::sharedBuffer() const
-{
- return SharedBuffer::bufferFromData(mString);
-}
-
String8 String8::format(const char* fmt, ...)
{
va_list args;