diff options
| author | Steven Moreland <smoreland@google.com> | 2022-11-30 18:40:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-11-30 18:40:06 +0000 |
| commit | d513a26af2caab740e53c7e6c63b5e98cfcff6ab (patch) | |
| tree | c4bcdcce7bd29638da2d466258ac17e0df348735 | |
| parent | 51b7ac6e128050f7966c130e4d5b3cb6f73905d0 (diff) | |
| parent | a6febb011a83a27ed7bfaaf40ccfd402f3819cbc (diff) | |
| download | native-d513a26af2caab740e53c7e6c63b5e98cfcff6ab.tar.gz | |
Merge "Revert "libbinder_ndk: toString never goes to empty strings.""
| -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>) { |