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

Commit 5817a83b authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "Add binder check for getConsumerName." into main

parents 255510a7 7d114940

libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1172,9 +1172,12 @@ status_t H2BGraphicBufferProducer::setGenerationNumber(uint32_t generationNumber 


String8 H2BGraphicBufferProducer::getConsumerName() const {

    String8 lName;

    mBase->getConsumerName([&lName] (hidl_string const& name) {

                lName = name.c_str();

            });

    status_t transStatus = toStatusT(

            mBase->getConsumerName([&lName](hidl_string const& name) { lName = name.c_str(); }));

    if (transStatus != NO_ERROR) {

        ALOGE("getConsumerName failed to transact: %d", transStatus);

        return String8("TransactFailed");

    }

    return lName;

}

libs/gui/bufferqueue/2.0/H2BGraphicBufferProducer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -437,6 +437,10 @@ String8 H2BGraphicBufferProducer::getConsumerName() const { 
            [&bName](hidl_string const& name) {

                bName = name.c_str();

            });

    if (!transResult.isOk()) {

        LOG(ERROR) << "getConsumerName: corrupted transaction.";

        return String8("TransactFailed");

    }

    return bName;

}