commit f26bc0f852b6794b804aff33e691e9b772260ff8
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 29 01:08:23 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 29 01:08:23 2022 +0000
tree c6f7a28cfecfb3ba0560ddce8135291f076eb63f
parent 658c74753bcc75a7cff3e034eecdae92f1ff14aa
parent bd7dc6e9ce016e7dd9c275933ed62665ba90fb55

Merge "libbinder_ndk: toString never goes to empty strings." am: 8e2b0f7444 am: bd7dc6e9ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2315865

Change-Id: I34bae238be7c08d5b2a8df1d43563c08c58209d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/ndk/include_cpp/android/binder_to_string.h

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 6a25db2..2a00736 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 @@
 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 @@
         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>) {