From 0bfea2dd184de2263d655632bdbcda4553b2ed56 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Fri, 11 Aug 2023 00:06:51 +0000 Subject: Use String8/16 c_str [binder] Current String8::string() has two problems: it may suggest it's returning a std::string and also prevents a drop-in replacement with std::string. Bug: 295394788 Test: make checkbuild Change-Id: I1eb6ddebe3faede57f3e6f046da572a79056125a --- libs/binder/Parcel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/binder/Parcel.cpp') diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 9b685f9145..5b34efc257 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -854,7 +854,7 @@ constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T'); // Write RPC headers. (previously just the interface token) status_t Parcel::writeInterfaceToken(const String16& interface) { - return writeInterfaceToken(interface.string(), interface.size()); + return writeInterfaceToken(interface.c_str(), interface.size()); } status_t Parcel::writeInterfaceToken(const char16_t* str, size_t len) { @@ -918,7 +918,7 @@ bool Parcel::checkInterface(IBinder* binder) const bool Parcel::enforceInterface(const String16& interface, IPCThreadState* threadState) const { - return enforceInterface(interface.string(), interface.size(), threadState); + return enforceInterface(interface.c_str(), interface.size(), threadState); } bool Parcel::enforceInterface(const char16_t* interface, @@ -977,8 +977,8 @@ bool Parcel::enforceInterface(const char16_t* interface, return true; } else { ALOGW("**** enforceInterface() expected '%s' but read '%s'", - String8(interface, len).string(), - String8(parcel_interface, parcel_interface_len).string()); + String8(interface, len).c_str(), + String8(parcel_interface, parcel_interface_len).c_str()); return false; } } @@ -1376,7 +1376,7 @@ status_t Parcel::writeCString(const char* str) status_t Parcel::writeString8(const String8& str) { - return writeString8(str.string(), str.size()); + return writeString8(str.c_str(), str.size()); } status_t Parcel::writeString8(const char* str, size_t len) @@ -1399,7 +1399,7 @@ status_t Parcel::writeString8(const char* str, size_t len) status_t Parcel::writeString16(const String16& str) { - return writeString16(str.string(), str.size()); + return writeString16(str.c_str(), str.size()); } status_t Parcel::writeString16(const char16_t* str, size_t len) -- cgit v1.2.3-59-g8ed1b