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

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

Merge "libbinder: make ParcelableHolder moveable" am: 41f65ffd am: ffc35896 

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

Change-Id: I7f417e9d86bdfbf9619501e184b7010da4b917b5
parents 2f614d12 ffc35896

libs/binder/include/binder/ParcelableHolder.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public: 
        }

        mStability = other.mStability;

    }

    ParcelableHolder(ParcelableHolder&& other) = default;



    status_t writeToParcel(Parcel* parcel) const override;

    status_t readFromParcel(const Parcel* parcel) override;

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class AParcelableHolder { 
    AParcelableHolder() = delete;

    explicit AParcelableHolder(parcelable_stability_t stability)

        : mParcel(AParcel_create()), mStability(stability) {}



    AParcelableHolder(AParcelableHolder&& other) = default;

    virtual ~AParcelableHolder() = default;



    binder_status_t writeToParcel(AParcel* parcel) const {