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

Commit 0c2c674d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Status: don't ignore status in writeToParcel" am: c18cb392 am: 0c73900c 

Change-Id: Ie3fa9be42305498c181d952adc45aa8a796aec8a
parents 191fe003 0c73900c

libs/binder/Status.cpp

+3 −1
Original line number Diff line number Diff line
@@ -193,13 +193,15 @@ status_t Status::writeToParcel(Parcel* parcel) const { 
    }



    status_t status = parcel->writeInt32(mException);

    if (status != OK) { return status; }

    if (status != OK) return status;

    if (mException == EX_NONE) {

        // We have no more information to write.

        return status;

    }

    status = parcel->writeString16(String16(mMessage));

    if (status != OK) return status;

    status = parcel->writeInt32(0); // Empty remote stack trace header

    if (status != OK) return status;

    if (mException == EX_SERVICE_SPECIFIC) {

        status = parcel->writeInt32(mErrorCode);

    } else if (mException == EX_PARCELABLE) {