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

Commit 869f04be authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge \"Fix broken readNullableStrongBinder<T> implementation\" 

am: 6e81c9a4

Change-Id: I4342a65c92cbc70f716b21c730f355da3f98dbbb
parents 23d1d108 6e81c9a4

include/binder/Parcel.h

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

        *val = interface_cast<T>(tmp);



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

            return UNKNOWN_ERROR;

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

            ret = UNKNOWN_ERROR;

        }

    }



    return ret;

}



template<typename T, typename U>