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

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

Merge "libbinder: remove unique_ptr FD APIs." into main am: 0ed1176a 

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



Change-Id: I12dfeb391da0dc9d6a4dd19c6e39430fa3d17bae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c0cd276 0ed1176a

libs/binder/Parcel.cpp

+0 −8
Original line number Original line Diff line number Diff line
@@ -1314,10 +1314,6 @@ status_t Parcel::writeUniqueFileDescriptorVector(const std::vector<unique_fd>& v 
status_t Parcel::writeUniqueFileDescriptorVector(const std::optional<std::vector<unique_fd>>& val) {

status_t Parcel::writeUniqueFileDescriptorVector(const std::optional<std::vector<unique_fd>>& val) {

    return writeData(val);

    return writeData(val);

}

}

status_t Parcel::writeUniqueFileDescriptorVector(

        const std::unique_ptr<std::vector<unique_fd>>& val) {

    return writeData(val);

}





status_t Parcel::writeStrongBinderVector(const std::vector<sp<IBinder>>& val) { return writeData(val); }

status_t Parcel::writeStrongBinderVector(const std::vector<sp<IBinder>>& val) { return writeData(val); }

status_t Parcel::writeStrongBinderVector(const std::optional<std::vector<sp<IBinder>>>& val) { return writeData(val); }

status_t Parcel::writeStrongBinderVector(const std::optional<std::vector<sp<IBinder>>>& val) { return writeData(val); }
@@ -1373,10 +1369,6 @@ status_t Parcel::readUtf8VectorFromUtf16Vector(std::vector<std::string>* val) co 
status_t Parcel::readUniqueFileDescriptorVector(std::optional<std::vector<unique_fd>>* val) const {

status_t Parcel::readUniqueFileDescriptorVector(std::optional<std::vector<unique_fd>>* val) const {

    return readData(val);

    return readData(val);

}

}

status_t Parcel::readUniqueFileDescriptorVector(

        std::unique_ptr<std::vector<unique_fd>>* val) const {

    return readData(val);

}

status_t Parcel::readUniqueFileDescriptorVector(std::vector<unique_fd>* val) const {

status_t Parcel::readUniqueFileDescriptorVector(std::vector<unique_fd>* val) const {

    return readData(val);

    return readData(val);

}

}

libs/binder/include/binder/Parcel.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -383,9 +383,6 @@ public: 
    LIBBINDER_EXPORTED status_t

    LIBBINDER_EXPORTED status_t

    writeUniqueFileDescriptorVector(const std::optional<std::vector<binder::unique_fd>>& val);

    writeUniqueFileDescriptorVector(const std::optional<std::vector<binder::unique_fd>>& val);

    LIBBINDER_EXPORTED status_t

    LIBBINDER_EXPORTED status_t

    writeUniqueFileDescriptorVector(const std::unique_ptr<std::vector<binder::unique_fd>>& val)

            __attribute__((deprecated("use std::optional version instead")));

    LIBBINDER_EXPORTED status_t

    writeUniqueFileDescriptorVector(const std::vector<binder::unique_fd>& val);

    writeUniqueFileDescriptorVector(const std::vector<binder::unique_fd>& val);





    // WARNING: deprecated and incompatible with AIDL. You should use Parcelable

    // WARNING: deprecated and incompatible with AIDL. You should use Parcelable
@@ -629,9 +626,6 @@ public: 
    LIBBINDER_EXPORTED status_t

    LIBBINDER_EXPORTED status_t

    readUniqueFileDescriptorVector(std::optional<std::vector<binder::unique_fd>>* val) const;

    readUniqueFileDescriptorVector(std::optional<std::vector<binder::unique_fd>>* val) const;

    LIBBINDER_EXPORTED status_t

    LIBBINDER_EXPORTED status_t

    readUniqueFileDescriptorVector(std::unique_ptr<std::vector<binder::unique_fd>>* val) const

            __attribute__((deprecated("use std::optional version instead")));

    LIBBINDER_EXPORTED status_t

    readUniqueFileDescriptorVector(std::vector<binder::unique_fd>* val) const;

    readUniqueFileDescriptorVector(std::vector<binder::unique_fd>* val) const;





    // WARNING: deprecated and incompatible with AIDL. You should use Parcelable

    // WARNING: deprecated and incompatible with AIDL. You should use Parcelable

libs/binder/tests/parcel_fuzzer/binder.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -318,8 +318,6 @@ std::vector<ParcelRead<::android::Parcel>> BINDER_PARCEL_READ_FUNCTIONS { 
    PARCEL_READ_NO_STATUS(int, readParcelFileDescriptor),

    PARCEL_READ_NO_STATUS(int, readParcelFileDescriptor),

    PARCEL_READ_WITH_STATUS(unique_fd, readUniqueFileDescriptor),

    PARCEL_READ_WITH_STATUS(unique_fd, readUniqueFileDescriptor),





    PARCEL_READ_WITH_STATUS(std::unique_ptr<std::vector<unique_fd>>,

            readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<unique_fd>>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::optional<std::vector<unique_fd>>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::vector<unique_fd>, readUniqueFileDescriptorVector),

    PARCEL_READ_WITH_STATUS(std::vector<unique_fd>, readUniqueFileDescriptorVector),