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

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

Merge "Revert "Make Parcel::readOutVectorSizeWithCheck public"" am: 3c461f10... 

Merge "Revert "Make Parcel::readOutVectorSizeWithCheck public"" am: 3c461f10 am: 8a15b8d5 am: 0e3bbcec

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



Change-Id: Id50d73a463d1dc6e3584131720902c53ab2aeba5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62f13f7d 0e3bbcec

libs/binder/include/binder/Parcel.h

+2 −6
Original line number Diff line number Diff line
@@ -542,12 +542,6 @@ public: 
    template<typename T>

    status_t            resizeOutVector(std::unique_ptr<std::vector<T>>* val) const __attribute__((deprecated("use std::optional version instead")));



    // Retrieve the size of an out vector and check against internal limits to

    // the size.

    // The returned size may be negative so caller must handle appropriately.

    // elemSize is the size of the element on the wire, if unknown use `1`.

    status_t readOutVectorSizeWithCheck(size_t elmSize, int32_t* size) const;



    // Like Parcel.java's readExceptionCode().  Reads the first int32

    // off of a Parcel's header, returning 0 or the negative error

    // code on exceptions, but also deals with skipping over rich
@@ -649,6 +643,8 @@ private: 
    status_t            flattenBinder(const sp<IBinder>& binder);

    status_t            unflattenBinder(sp<IBinder>* out) const;



    status_t readOutVectorSizeWithCheck(size_t elmSize, int32_t* size) const;



    template<class T>

    status_t            readAligned(T *pArg) const;