diff options
| author | 2022-12-06 04:00:47 +0000 | |
|---|---|---|
| committer | 2022-12-06 04:00:47 +0000 | |
| commit | 6a33c6517da5d384f4f2466c8ac310dcc7c64e27 (patch) | |
| tree | e9698c8bf08a258b85c32a06f0929b6dea1b3640 | |
| parent | 74a6e128624468e11ccdfb1f82a49e6e0a195cb6 (diff) | |
| parent | ed681dee160cd801a4146657ee06edc10182f9ef (diff) | |
Merge "Revert "Revert "libbinder_ndk: toString never goes to empty stri..."" am: b4507cef95 am: b498dde096 am: ed681dee16
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2320378
Change-Id: Iebfbc2736c93e4461fccc04516fd96242b17c2e3
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>) { |