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

Commit 78626471 authored by Steven Moreland's avatar Steven Moreland
Browse files

Status: don't ignore status in writeToParcel 

While it may be safe in practice, we should not rely on it.

Bug: n/A
Test: n/A
Change-Id: Id33d577f64449b966bdf6327c9a37886b435ed7c
parent e5c824b2

libs/binder/Status.cpp

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

    }





    status_t status = parcel->writeInt32(mException);

    status_t status = parcel->writeInt32(mException);

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

    if (status != OK) return status;

    if (mException == EX_NONE) {

    if (mException == EX_NONE) {

        // We have no more information to write.

        // We have no more information to write.

        return status;

        return status;

    }

    }

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

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

    if (status != OK) return status;

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

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

    if (status != OK) return status;

    if (mException == EX_SERVICE_SPECIFIC) {

    if (mException == EX_SERVICE_SPECIFIC) {

        status = parcel->writeInt32(mErrorCode);

        status = parcel->writeInt32(mErrorCode);

    } else if (mException == EX_PARCELABLE) {

    } else if (mException == EX_PARCELABLE) {