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

Commit 9484f100 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-c1a0decd4edb4d969c9b6e20758efcc9" 

* changes:
  Merge "libbinder_ndk: clarify AParcel_writeStatusHeader" am: d151ccd9 am: e97e55b1 am: 83ad5153
  Merge "libbinder: Status writeToParcel no OK on ERR" am: 3ee5c2c9 am: 2ef48dec am: 9683ad4a
parents a6fb4a3b 5cf01b9a

libs/binder/Status.cpp

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ status_t Status::writeToParcel(Parcel* parcel) const { 
    // Something really bad has happened, and we're not going to even

    // try returning rich error data.

    if (mException == EX_TRANSACTION_FAILED) {

        return mErrorCode;

        return mErrorCode == OK ? FAILED_TRANSACTION : mErrorCode;

    }



    status_t status = parcel->writeInt32(mException);

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

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ binder_status_t AParcel_readNullableStrongBinder(const AParcel* parcel, AIBinder 


/**

 * Writes an AStatus object to the next location in a non-null parcel.

 *

 * If the status is considered to be a low-level status and has no additional information other

 * than a binder_status_t (for instance, if it is created with AStatus_fromStatus), then that

 * status will be returned from this method and nothing will be written to the parcel. If either

 * this happens or if writing the status object itself fails, the return value from this function

 * should be propagated to the client, and AParcel_readStatusHeader shouldn't be called.

 */

binder_status_t AParcel_writeStatusHeader(AParcel* parcel, const AStatus* status);