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

Commit a6334bf9 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "ParcelableHolder/ParcelFileDescriptor toString" am: df1bcf84 am: 3efbdb09 am: 5a33eb43 

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



Change-Id: I6d9628a6cf5076ff08382dd1ac56f9d72bc11641
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4079d69a 5a33eb43

libs/binder/include/binder/ParcelFileDescriptor.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public: 
    android::status_t writeToParcel(android::Parcel* parcel) const override;

    android::status_t readFromParcel(const android::Parcel* parcel) override;



    inline std::string toString() const { return "ParcelFileDescriptor:" + std::to_string(get()); }

    inline bool operator!=(const ParcelFileDescriptor& rhs) const {

        return mFd.get() != rhs.mFd.get();

    }

libs/binder/include/binder/ParcelableHolder.h

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ public: 


    Stability getStability() const override { return mStability; }



    inline std::string toString() const {

        return "ParcelableHolder:" +

                (mParcelableName ? std::string(String8(mParcelableName.value()).c_str())

                                 : "<parceled>");

    }

    inline bool operator!=(const ParcelableHolder& rhs) const {

        return this != &rhs;

    }

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

+1 −5
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ 
#if __has_include(<binder/RpcSession.h>)

#include <binder/IBinder.h>

#include <binder/IInterface.h>

#include <binder/ParcelFileDescriptor.h>

#include <binder/ParcelableHolder.h>

#define HAS_CPP_INTERFACE

#endif
@@ -152,9 +150,7 @@ class ToEmptyString { 
#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>

                                    std::is_same_v<IBinder, _U>

#endif

                            ,

                            std::true_type>