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

Commit 9683ad4a 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

Change-Id: I032fdd6e4a8827a80d3d8973b486a2bf94348c41
parents e6a32a86 2ef48dec

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