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

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

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

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

Change-Id: I1c2bc9c8815a7f32ee66ee968ce367d1361a0b11
parents 9dd50de0 bab6894a

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ static inline binder_status_t AParcel_readNullableParcelable(const AParcel* parc 
            *p = std::nullopt;

            *p = std::nullopt;

            return STATUS_OK;

            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);

        return (*p)->readFromParcel(parcel);

    } else {

    } else {

        static_assert(is_specialization_v<P, std::unique_ptr>);

        static_assert(is_specialization_v<P, std::unique_ptr>);