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

Commit 04d19615 authored by Jooyung Han's avatar Jooyung Han
Browse files

Parcel: add "optional" variant of writeParcelableVector 

Since Android R, Parcel provides read/write methods for "@nullable"
values using std::optional.

Adding "optional" variant of writeParcelableVector which was missed
when adding optional variants of read/write methods before deprecating
"unique_ptr" variants.

Bug: 149784838
Test: m
Change-Id: I2f6781ea5e367d414a371c55a3eb8fe794c144d0
parent 4d9f91a1

libs/binder/include/binder/Parcel.h

+12 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ public: 
    template<typename T>

    status_t            writeParcelableVector(const std::shared_ptr<std::vector<std::unique_ptr<T>>>& val);

    template<typename T>

    status_t            writeParcelableVector(const std::shared_ptr<std::vector<std::optional<T>>>& val);

    template<typename T>

    status_t            writeParcelableVector(const std::vector<T>& val);



    template<typename T>
@@ -1229,6 +1231,16 @@ status_t Parcel::writeParcelableVector(const std::shared_ptr<std::vector<std::un 
    return unsafeWriteTypedVector<NullableT, const NullableT&>(*val, &Parcel::writeNullableParcelable);

}



template<typename T>

status_t Parcel::writeParcelableVector(const std::shared_ptr<std::vector<std::optional<T>>>& val) {

    if (val.get() == nullptr) {

        return this->writeInt32(-1);

    }



    using NullableT = std::optional<T>;

    return unsafeWriteTypedVector<NullableT, const NullableT&>(*val, &Parcel::writeNullableParcelable);

}



template<typename T, std::enable_if_t<std::is_same_v<typename std::underlying_type_t<T>,int32_t>, bool>>

status_t Parcel::writeEnum(const T& val) {

    return writeInt32(static_cast<int32_t>(val));