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

Commit e2082bc0 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: Status writeToParcel no OK on ERR" am: 3ee5c2c9 am: 2ef48dec 

am: 9683ad4a

Change-Id: I8a822e8041a1027f0935238a6d64bbcd57a7bb7e
parents 29c2351c 9683ad4a

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);