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

Commit 27810217 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by android-build-merger
Browse files

Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev 

am: 0950fb3d

* commit '0950fb3d':
  Fix Parcelable::readParcelableVector<T>

Change-Id: I4fd443663515eec05d992bf42263fea7d9bdc7c4
parents 1ddf4d8d 0950fb3d

include/binder/Parcel.h

+2 −2
Original line number Diff line number Diff line
@@ -723,9 +723,9 @@ status_t Parcel::readParcelableVector(std::unique_ptr<std::vector<std::unique_pt 
    }



    setDataPosition(start);

    val->reset(new std::vector<T>());

    val->reset(new std::vector<std::unique_ptr<T>>());



    status = unsafeReadTypedVector(val->get(), &Parcel::readParcelable);

    status = unsafeReadTypedVector(val->get(), &Parcel::readParcelable<T>);



    if (status != OK) {

        val->reset();