From 282efae9c3d14ca2641e5fea223cb1be204feff1 Mon Sep 17 00:00:00 2001 From: Sergio Giro Date: Wed, 30 Sep 2015 15:28:30 +0100 Subject: [PATCH] system/core: remove methods returning SharedBuffer in String8, String16 Towards deprecation of SharedBuffer Change-Id: I3069837db32837bcc0f5d8f1118ccd502c9070dc --- include/utils/String16.h | 2 -- include/utils/String8.h | 2 -- libutils/String16.cpp | 5 ----- libutils/String8.cpp | 5 ----- 4 files changed, 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;