diff options
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/include/binder/ParcelFileDescriptor.h | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index d411191c62..ef4bfb44f7 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -147,6 +147,7 @@ cc_library { "-Wextra", "-Werror", "-Wzero-as-null-pointer-constant", + "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION", ], product_variables: { binder32bit: { diff --git a/libs/binder/include/binder/ParcelFileDescriptor.h b/libs/binder/include/binder/ParcelFileDescriptor.h index 4ba6ba8ed2..9896fd7a51 100644 --- a/libs/binder/include/binder/ParcelFileDescriptor.h +++ b/libs/binder/include/binder/ParcelFileDescriptor.h @@ -43,22 +43,22 @@ public: android::status_t readFromParcel(const android::Parcel* parcel) override; inline bool operator!=(const ParcelFileDescriptor& rhs) const { - return mFd != rhs.mFd; + return mFd.get() != rhs.mFd.get(); } inline bool operator<(const ParcelFileDescriptor& rhs) const { - return mFd < rhs.mFd; + return mFd.get() < rhs.mFd.get(); } inline bool operator<=(const ParcelFileDescriptor& rhs) const { - return mFd <= rhs.mFd; + return mFd.get() <= rhs.mFd.get(); } inline bool operator==(const ParcelFileDescriptor& rhs) const { - return mFd == rhs.mFd; + return mFd.get() == rhs.mFd.get(); } inline bool operator>(const ParcelFileDescriptor& rhs) const { - return mFd > rhs.mFd; + return mFd.get() > rhs.mFd.get(); } inline bool operator>=(const ParcelFileDescriptor& rhs) const { - return mFd >= rhs.mFd; + return mFd.get() >= rhs.mFd.get(); } private: android::base::unique_fd mFd; |