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

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

Merge "setParcelable uses const ref instead of pointer" am: e42a54b1 am: 2350502a 

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

Change-Id: I3cd9690dffc8636bf845c920781a840589dc374a
parents d6377fe1 2350502a

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

+5 −3
Original line number Diff line number Diff line
@@ -82,13 +82,13 @@ class AParcelableHolder { 
    }



    template <typename T>

    bool setParcelable(T* p) {

        if (p && this->mStability > T::_aidl_stability) {

    bool setParcelable(const T& p) {

        if (this->mStability > T::_aidl_stability) {

            return false;

        }

        AParcel_reset(mParcel.get());

        AParcel_writeString(mParcel.get(), T::descriptor, strlen(T::descriptor));

        p->writeToParcel(mParcel.get());

        p.writeToParcel(mParcel.get());

        return true;

    }
@@ -112,6 +112,8 @@ class AParcelableHolder { 
        return std::move(ret);

    }



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



   private:

    mutable ndk::ScopedAParcel mParcel;

    parcelable_stability_t mStability;