| commit | 84825237506082c423ae59e96ca223f46f123971 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 11 05:52:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 11 05:52:49 2021 +0000 |
| tree | 69f7e0588e691942056eaf9a6dc51a0dc2c2ba1d | |
| parent | a5d05a33c52660b208951958933cd6810f017750 [diff] | |
| parent | dd8ab562c430c933b92b70a3423868c229c67a88 [diff] |
Merge "libbinder_ndk: do not rely on copyability of parcelables" am: 22082f2d94 am: bab6894a08 am: dd8ab562c4 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1918640 Change-Id: I5ddf7809e4b7b6371fc700afbf5427eff5eab206
diff --git a/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h index 67623a6..c1487c0 100644 --- a/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h
@@ -560,7 +560,7 @@ *p = std::nullopt; return STATUS_OK; } - *p = std::optional<first_template_type_t<P>>(first_template_type_t<P>{}); + p->emplace(first_template_type_t<P>()); return (*p)->readFromParcel(parcel); } else { static_assert(is_specialization_v<P, std::unique_ptr>);