summaryrefslogtreecommitdiff
path: root/libutils
diff options
context:
space:
mode:
authorSergio Giro <sgiro@google.com>2015-09-30 20:20:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-30 20:20:21 +0000
commit58a25053c6b66434ffda056a885d9162265230b6 (patch)
tree19735201313c01d1b97e0a4830aae4b15345e923 /libutils
parent845ce5fc9a4ff444ad786eb20cd229d3d11f80f3 (diff)
parentc559a9b52fe79c5be32121f8f82c672a5eac94ef (diff)
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
Diffstat (limited to 'libutils')
-rw-r--r--libutils/String16.cpp5
-rw-r--r--libutils/String8.cpp5
2 files changed, 0 insertions, 10 deletions
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 4fca2c119..771d31266 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -220,11 +220,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;