diff options
| author | 2022-11-30 20:28:09 +0000 | |
|---|---|---|
| committer | 2022-11-30 20:28:09 +0000 | |
| commit | be4f425cd382d964817cfcc60d5490e08555173f (patch) | |
| tree | f0c5e723633ee218efa9a7b32bf02bc2764709bf | |
| parent | 38ea517ffc9eeafd73dabf2b37c6599f978706b3 (diff) | |
| parent | 8442f463f3ef092a6d78cd361f1dc8ee11255aee (diff) | |
Merge "Revert "libbinder_ndk: toString never goes to empty strings."" am: d513a26af2 am: aa8fdc0a71 am: 8442f463f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321904
Change-Id: I8170751327caa6457f23571509c1b10b30f3220d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_to_string.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/binder/ndk/include_cpp/android/binder_to_string.h b/libs/binder/ndk/include_cpp/android/binder_to_string.h index 2a00736bc3..6a25db220f 100644 --- a/libs/binder/ndk/include_cpp/android/binder_to_string.h +++ b/libs/binder/ndk/include_cpp/android/binder_to_string.h @@ -160,7 +160,7 @@ class ToEmptyString { template <typename _T> std::string ToString(const _T& t) { if constexpr (details::ToEmptyString<_T>::value) { - return "<unimplemented>"; + return ""; } else if constexpr (std::is_same_v<bool, _T>) { return t ? "true" : "false"; } else if constexpr (std::is_same_v<char16_t, _T>) { @@ -176,11 +176,9 @@ std::string ToString(const _T& t) { return t; #ifdef HAS_NDK_INTERFACE } else if constexpr (std::is_same_v<::ndk::SpAIBinder, _T>) { - std::stringstream ss; - ss << "binder:" << std::hex << t.get(); - return ss.str(); + return (t.get() == nullptr) ? "(null)" : ""; } else if constexpr (std::is_same_v<::ndk::ScopedFileDescriptor, _T>) { - return "fd:" + std::to_string(t.get()); + return (t.get() == -1) ? "(null)" : ""; #endif #ifdef HAS_STRING16 } else if constexpr (std::is_same_v<String16, _T>) { |