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

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

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

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

Change-Id: I942fb9938614fa60359b478a7f7445d8475cdec0
parents 84adff87 7795accb

libs/binder/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ cc_library { 
        "-Wextra",

        "-Wextra",

        "-Werror",

        "-Werror",

        "-Wzero-as-null-pointer-constant",

        "-Wzero-as-null-pointer-constant",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

    ],

    ],

    product_variables: {

    product_variables: {

        binder32bit: {

        binder32bit: {

libs/binder/include/binder/ParcelFileDescriptor.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -43,22 +43,22 @@ public: 
    android::status_t readFromParcel(const android::Parcel* parcel) override;

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





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

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

        return mFd != rhs.mFd;

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

    }

    }

    inline bool operator<(const ParcelFileDescriptor& rhs) const {

    inline bool operator<(const ParcelFileDescriptor& rhs) const {

        return mFd < rhs.mFd;

        return mFd.get() < rhs.mFd.get();

    }

    }

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

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

        return mFd <= rhs.mFd;

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

    }

    }

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

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

        return mFd == rhs.mFd;

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

    }

    }

    inline bool operator>(const ParcelFileDescriptor& rhs) const {

    inline bool operator>(const ParcelFileDescriptor& rhs) const {

        return mFd > rhs.mFd;

        return mFd.get() > rhs.mFd.get();

    }

    }

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

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

        return mFd >= rhs.mFd;

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

    }

    }

private:

private:

    android::base::unique_fd mFd;

    android::base::unique_fd mFd;