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

Commit 2fb9524d authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "bufferqueue: allow null stream in H2BGBP::setSidebandStream" into oc-dev am: 7fe71f8b 

am: adfe5be2

Change-Id: Ib04a7895ba2e0215800059131c0b6fa13d832d1f
parents 73defb8d adfe5be2

libs/gui/bufferqueue/1.0/H2BGraphicBufferProducer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1141,7 +1141,7 @@ status_t H2BGraphicBufferProducer::disconnect(int api, DisconnectMode mode) { 




status_t H2BGraphicBufferProducer::setSidebandStream(

status_t H2BGraphicBufferProducer::setSidebandStream(

        const sp<NativeHandle>& stream) {

        const sp<NativeHandle>& stream) {

    return toStatusT(mBase->setSidebandStream(stream->handle()));

    return toStatusT(mBase->setSidebandStream(stream == nullptr ? nullptr : stream->handle()));

}

}





void H2BGraphicBufferProducer::allocateBuffers(uint32_t width, uint32_t height,

void H2BGraphicBufferProducer::allocateBuffers(uint32_t width, uint32_t height,