diff options
| author | 2022-11-29 00:42:41 +0000 | |
|---|---|---|
| committer | 2022-11-29 00:42:41 +0000 | |
| commit | bd7dc6e9ce016e7dd9c275933ed62665ba90fb55 (patch) | |
| tree | d9842b0d42aa72a98a66cf411649e2a9048eb0a4 | |
| parent | 91609c37dec6a06dc90cffd0ee69ce873bae44e1 (diff) | |
| parent | 8e2b0f7444f85e0bd05320f9326020dc7a7f58e3 (diff) | |
Merge "libbinder_ndk: toString never goes to empty strings." am: 8e2b0f7444
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2315865
Change-Id: I37b6093ffca0e2ad3534bfd110432b183cc09c07
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, 5 insertions, 3 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 6a25db220f..2a00736bc3 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 ""; + return "<unimplemented>"; } else if constexpr (std::is_same_v<bool, _T>) { return t ? "true" : "false"; } else if constexpr (std::is_same_v<char16_t, _T>) { @@ -176,9 +176,11 @@ std::string ToString(const _T& t) { return t; #ifdef HAS_NDK_INTERFACE } else if constexpr (std::is_same_v<::ndk::SpAIBinder, _T>) { - return (t.get() == nullptr) ? "(null)" : ""; + std::stringstream ss; + ss << "binder:" << std::hex << t.get(); + return ss.str(); } else if constexpr (std::is_same_v<::ndk::ScopedFileDescriptor, _T>) { - return (t.get() == -1) ? "(null)" : ""; + return "fd:" + std::to_string(t.get()); #endif #ifdef HAS_STRING16 } else if constexpr (std::is_same_v<String16, _T>) { |