diff options
| author | 2022-12-29 00:09:19 +0000 | |
|---|---|---|
| committer | 2023-01-12 01:21:34 +0000 | |
| commit | f1389059d7c163e0096312dbdb9bdb49d8ecf746 (patch) | |
| tree | df8efe0094a22a259fbca8f9b2745b61c7e32f00 | |
| parent | 8cf3e9ffbd3a5e51f86d68754cc020d5e6d9f676 (diff) | |
ParcelableHolder/ParcelFileDescriptor toString
Bug: 259162245
Test: N/A
Change-Id: I1479b7b58ba4ccd7a9bff43d7ce962e0f1b28678
| -rw-r--r-- | libs/binder/include/binder/ParcelFileDescriptor.h | 1 | ||||
| -rw-r--r-- | libs/binder/include/binder/ParcelableHolder.h | 5 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_to_string.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libs/binder/include/binder/ParcelFileDescriptor.h b/libs/binder/include/binder/ParcelFileDescriptor.h index 9896fd7a51..08d8e43106 100644 --- a/libs/binder/include/binder/ParcelFileDescriptor.h +++ b/libs/binder/include/binder/ParcelFileDescriptor.h @@ -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(); } diff --git a/libs/binder/include/binder/ParcelableHolder.h b/libs/binder/include/binder/ParcelableHolder.h index 88790a803b..40fd30ae3f 100644 --- a/libs/binder/include/binder/ParcelableHolder.h +++ b/libs/binder/include/binder/ParcelableHolder.h @@ -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; } 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 e3ead11475..9b0d222147 100644 --- a/libs/binder/ndk/include_cpp/android/binder_to_string.h +++ b/libs/binder/ndk/include_cpp/android/binder_to_string.h @@ -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> |