commit e8e37c2eb74c2fac0e75e55f15cb6630fdb709c5
author Steven Moreland <smoreland@google.com> Mon Nov 16 16:27:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 16 16:27:39 2020 +0000
tree 425d39fa6cc81329d4ae2019dc8f338fb056ce11
parent 84adff87d5ccd2d09dfdc5d0f2b285d4efffe1e8
parent 7795accbd2086a2f73b2dd1008d5c8bac24166ff

Merge "libbinder: disable implicit unique_fd get" am: 7795accbd2

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

Change-Id: I942fb9938614fa60359b478a7f7445d8475cdec0

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index d4cc907..8428ce5 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -146,6 +146,7 @@
         "-Wextra",
         "-Werror",
         "-Wzero-as-null-pointer-constant",
+        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
     ],
     product_variables: {
         binder32bit: {

libs/binder/include/binder/ParcelFileDescriptor.h

diff --git a/libs/binder/include/binder/ParcelFileDescriptor.h b/libs/binder/include/binder/ParcelFileDescriptor.h
index 4ba6ba8..9896fd7 100644
--- a/libs/binder/include/binder/ParcelFileDescriptor.h
+++ b/libs/binder/include/binder/ParcelFileDescriptor.h
@@ -43,22 +43,22 @@
     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;