diff options
| author | 2016-06-07 19:23:45 +0000 | |
|---|---|---|
| committer | 2016-06-07 19:23:45 +0000 | |
| commit | 0950fb3d20d100f62961db1cc3eff51b51f9ca6b (patch) | |
| tree | 6cea3678359347243be82ad15033874876e6f2ad | |
| parent | 572e23d7614485a06102b00667d003b21b874bf9 (diff) | |
| parent | f26a3ab7758bdbc1c87940216e542b2cc58c4377 (diff) | |
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
| -rw-r--r-- | include/binder/Parcel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 2685bcc807..1c355c4689 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -705,9 +705,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(); |