diff options
| author | 2023-08-25 20:30:24 +0000 | |
|---|---|---|
| committer | 2023-08-25 20:30:24 +0000 | |
| commit | ebd8165187e2b5f19940333070dbf44951659d5a (patch) | |
| tree | c900ebda0942e35fdae3b61a15ff74abf08db234 /libs/binder/Parcel.cpp | |
| parent | d524ca0216ee664feb204bea351a158061721681 (diff) | |
| parent | 132e9278609348bf674d2ac56fea96917d61455c (diff) | |
Merge "Use String8/16 c_str [binder]" into main am: a79915269d am: 13da0f9a0f am: 7e5716d5fd am: 5f539c068f am: 132e927860
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2704458
Change-Id: I25e93d8f301178b4a45e6a5b82f2ff4abf99ff9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/binder/Parcel.cpp')
| -rw-r--r-- | libs/binder/Parcel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index bbaa419cf0..817e0fc756 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -895,7 +895,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) { @@ -959,7 +959,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, @@ -1018,8 +1018,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; } } @@ -1417,7 +1417,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) @@ -1440,7 +1440,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) |