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

Commit c7ded977 authored by Yu Shan's avatar Yu Shan Committed by Automerger Merge Worker
Browse files

Merge "Add marshal() and unmarshal() APIs." am: cf2e66bf am: af8f9d66 am:... 

Merge "Add marshal() and unmarshal() APIs." am: cf2e66bf am: af8f9d66 am: 401f796f am: b19e7d7b

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

Change-Id: Iacbf958c3cb39c0ea9c014af81b6ac85823779d7
parents 4d827464 b19e7d7b

libs/binder/ndk/include_ndk/android/binder_parcel.h

+35 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,41 @@ binder_status_t AParcel_appendFrom(const AParcel* from, AParcel* to, int32_t sta 
 * \return A parcel which is not related to any IBinder objects.

 */

AParcel* AParcel_create() __INTRODUCED_IN(31);



/**

 * Marshals the raw bytes of the Parcel to a buffer.

 *

 * The parcel must not contain any binders or file descriptors.

 *

 * The data you retrieve here must not be placed in any kind of persistent storage. (on local disk,

 * across a network, etc). For that, you should use standard serialization or another kind of

 * general serialization mechanism. The Parcel marshalled representation is highly optimized for

 * local IPC, and as such does not attempt to maintain compatibility with data created in different

 * versions of the platform.

 *

 * \param parcel The parcel of which to get the data.

 * \param buffer The buffer to copy the raw bytes to.

 * \param start The start position in the buffer to copy from.

 * \param len The size of the data to copy, buffer size must be larger or equal to this.

 *

 * \return STATUS_OK on success, STATUS_INVALID_OPERATION if parcel contains binders or file

 * descriptors. STATUS_BAD_VALUE if the buffer size is less than parcel size.

 */

binder_status_t AParcel_marshal(const AParcel* parcel, uint8_t* buffer, size_t start, size_t len)

        __INTRODUCED_IN(33);



/**

 * Set the data in the parcel to the raw bytes from the buffer.

 *

 * \param parcel The parcel to set data.

 * \param buffer The data buffer to set.

 * \param len The size of the data to set.

 *

 * \return STATUS_OK on success.

 */

binder_status_t AParcel_unmarshal(AParcel* parcel, const uint8_t* buffer, size_t len)

        __INTRODUCED_IN(33);



__END_DECLS



/** @} */

libs/binder/ndk/libbinder_ndk.map.txt

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ LIBBINDER_NDK31 { # introduced=31 
LIBBINDER_NDK33 { # introduced=33

  global:

    AIBinder_Class_disableInterfaceTokenHeader;

    AParcel_marshal;

    AParcel_unmarshal;

};



LIBBINDER_NDK_PLATFORM {

libs/binder/ndk/parcel.cpp

+28 −0
Original line number Diff line number Diff line
@@ -673,4 +673,32 @@ AParcel* AParcel_create() { 
    return new AParcel(nullptr);

}



binder_status_t AParcel_marshal(const AParcel* parcel, uint8_t* buffer, size_t start, size_t len) {

    if (parcel->get()->objectsCount()) {

        return STATUS_INVALID_OPERATION;

    }

    int32_t dataSize = AParcel_getDataSize(parcel);

    if (len > static_cast<size_t>(dataSize) || start > static_cast<size_t>(dataSize) - len) {

        return STATUS_BAD_VALUE;

    }

    const uint8_t* internalBuffer = parcel->get()->data();

    memcpy(buffer, internalBuffer + start, len);

    return STATUS_OK;

}



binder_status_t AParcel_unmarshal(AParcel* parcel, const uint8_t* buffer, size_t len) {

    status_t status = parcel->get()->setDataSize(len);

    if (status != ::android::OK) {

        return PruneStatusT(status);

    }

    parcel->get()->setDataPosition(0);



    void* raw = parcel->get()->writeInplace(len);

    if (raw == nullptr) {

        return STATUS_NO_MEMORY;

    }

    memcpy(raw, buffer, len);

    return STATUS_OK;

}



// @END