Merge changes Ia6ef5a21,Ic7a74588
* changes:
Do not transform values from a SOURCE_MOUSE_RELATIVE device
Apply pointer capture changes only in mode POINTER_RELATIVE
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 2a00736..6a25db2 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 "<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 @@
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>) {