Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed681dee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "libbinder_ndk: toString never goes to empty stri...""... 

Merge "Revert "Revert "libbinder_ndk: toString never goes to empty stri..."" am: b4507cef am: b498dde0

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



Change-Id: I24527480fa251995f66ec69a4ea9d6713b468bbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de1d211c b498dde0

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

+5 −3
Original line number Diff line number Diff line
@@ -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>) {