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

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

Merge "libbinder*: ToString - pound def made consistent" am: 80a63e94 

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



Change-Id: Id6f9a6e0b9a08495cf45f38414d5eb9c503e389b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 424fc485 80a63e94

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

+36 −11
Original line number Diff line number Diff line
@@ -49,12 +49,19 @@ 
#include <android/binder_interface_utils.h>

#include <android/binder_parcelable_utils.h>

#define HAS_NDK_INTERFACE

#else

#endif



// TODO: some things include libbinder without having access to libbase. This is

// due to frameworks/native/include, which symlinks to libbinder headers, so even

// though we don't use it here, we detect a different header, so that we are more

// confident libbase will be included

#if __has_include(<binder/RpcSession.h>)

#include <binder/IBinder.h>

#include <binder/IInterface.h>

#include <binder/ParcelFileDescriptor.h>

#include <binder/ParcelableHolder.h>

#endif  //_has_include

#define HAS_CPP_INTERFACE

#endif



namespace android {

namespace internal {
@@ -134,14 +141,16 @@ class IsIterable { 
template <typename _T>

class ToEmptyString {

    template <typename _U>

    static std::enable_if_t<

    static std::enable_if_t<false

#ifdef HAS_NDK_INTERFACE

            std::is_base_of_v<::ndk::ICInterface, _U>

                                    || std::is_base_of_v<::ndk::ICInterface, _U>

#if __ANDROID_API__ >= 31

                                    || std::is_same_v<::ndk::AParcelableHolder, _U>

#endif

#else

            std::is_base_of_v<IInterface, _U> || std::is_same_v<IBinder, _U> ||

#endif  // HAS_NDK_INTERFACE

#ifdef HAS_CPP_INTERFACE

                                    || std::is_base_of_v<IInterface, _U> ||

                                    std::is_same_v<IBinder, _U> ||

                                    std::is_same_v<os::ParcelFileDescriptor, _U> ||

                                    std::is_same_v<os::ParcelableHolder, _U>

#endif
@@ -221,4 +230,20 @@ std::string ToString(const _T& t) { 
}  // namespace internal

}  // namespace android



#ifdef HAS_STRONG_POINTER

#undef HAS_STRONG_POINTER

#endif



#ifdef HAS_STRING16

#undef HAS_STRING16

#endif



#ifdef HAS_NDK_INTERFACE

#undef HAS_NDK_INTERFACE

#endif



#ifdef HAS_CPP_INTERFACE

#undef HAS_CPP_INTERFACE

#endif



/** @} */