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

Commit b5c4befe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ParcelableHolder uses its address for comparison" am: dad360f4 am: 32dca72b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c36d6f26c6a855a890329fc8c5229e5946b2d36
parents cc45cabc 32dca72b

libs/binder/include/binder/ParcelableHolder.h

+6 −12
Original line number Original line Diff line number Diff line
@@ -104,28 +104,22 @@ public: 
    Stability getStability() const override { return mStability; }

    Stability getStability() const override { return mStability; }





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

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

        return std::tie(mParcelable, mParcelPtr, mStability) !=

        return this != &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }

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

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

        return std::tie(mParcelable, mParcelPtr, mStability) <

        return this < &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }

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

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

        return std::tie(mParcelable, mParcelPtr, mStability) <=

        return this <= &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }

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

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

        return std::tie(mParcelable, mParcelPtr, mStability) ==

        return this == &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }

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

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

        return std::tie(mParcelable, mParcelPtr, mStability) >

        return this > &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }

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

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

        return std::tie(mParcelable, mParcelPtr, mStability) >=

        return this >= &rhs;

                std::tie(rhs.mParcelable, rhs.mParcelPtr, rhs.mStability);

    }

    }





private:

private:

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

+6 −18
Original line number Original line Diff line number Diff line
@@ -114,24 +114,12 @@ class AParcelableHolder { 




    void reset() { AParcel_reset(mParcel.get()); }

    void reset() { AParcel_reset(mParcel.get()); }





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

    inline bool operator!=(const AParcelableHolder& rhs) const { return this != &rhs; }

        return std::tie(mParcel, mStability) != std::tie(rhs.mParcel, rhs.mStability);

    inline bool operator<(const AParcelableHolder& rhs) const { return this < &rhs; }

    }

    inline bool operator<=(const AParcelableHolder& rhs) const { return this <= &rhs; }

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

    inline bool operator==(const AParcelableHolder& rhs) const { return this == &rhs; }

        return std::tie(mParcel, mStability) < std::tie(rhs.mParcel, rhs.mStability);

    inline bool operator>(const AParcelableHolder& rhs) const { return this > &rhs; }

    }

    inline bool operator>=(const AParcelableHolder& rhs) const { return this >= &rhs; }

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

        return std::tie(mParcel, mStability) <= std::tie(rhs.mParcel, rhs.mStability);

    }

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

        return std::tie(mParcel, mStability) == std::tie(rhs.mParcel, rhs.mStability);

    }

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

        return std::tie(mParcel, mStability) > std::tie(rhs.mParcel, rhs.mStability);

    }

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

        return std::tie(mParcel, mStability) >= std::tie(rhs.mParcel, rhs.mStability);

    }





   private:

   private:

    mutable ndk::ScopedAParcel mParcel;

    mutable ndk::ScopedAParcel mParcel;