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

Commit 7dee4ed3 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge \\\"Fix broken readNullableStrongBinder<T> implementation\\\" am: 6e81c9a4 am: 869f04be 

am: 4cfcfe48

Change-Id: Id8a332161174e334b336ba2528c34014c5b1ac55
parents 00c6b9cc 4cfcfe48

include/binder/Parcel.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -586,10 +586,12 @@ status_t Parcel::readNullableStrongBinder(sp<T>* val) const { 
    if (ret == OK) {

    if (ret == OK) {

        *val = interface_cast<T>(tmp);

        *val = interface_cast<T>(tmp);





        if (val->get() == nullptr) {

        if (val->get() == nullptr && tmp.get() != nullptr) {

            return UNKNOWN_ERROR;

            ret = UNKNOWN_ERROR;

        }

        }

    }

    }



    return ret;

}

}





template<typename T, typename U>

template<typename T, typename U>