Commit 84825237 authored Dec 11, 2021 by Treehugger Robot Committed by Automerger Merge Worker Dec 11, 2021

Merge "libbinder_ndk: do not rely on copyability of parcelables" am:...

Merge "libbinder_ndk: do not rely on copyability of parcelables" am: 22082f2d am: bab6894a am: dd8ab562

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

Change-Id: I5ddf7809e4b7b6371fc700afbf5427eff5eab206

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@ static inline binder_status_t AParcel_readNullableParcelable(const AParcel* parc
		*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>);