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

Commit d7de179a authored by Pablo Ceballos's avatar Pablo Ceballos Committed by android-build-merger
Browse files

libgui: Add null pointer check in setDisplaySurface am: eddbef88 am: 8663a034 

am: 739c90cb

Change-Id: I587f5160c6abb9e4e4c98657658ff63a91ac1a40
parents 72c3c2d2 739c90cb

libs/gui/SurfaceComposerClient.cpp

+10 −8
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ DisplayState& Composer::getDisplayStateLocked(const sp<IBinder>& token) { 


status_t Composer::setDisplaySurface(const sp<IBinder>& token,

        sp<IGraphicBufferProducer> bufferProducer) {

    if (bufferProducer.get() != nullptr) {

        // Make sure that composition can never be stalled by a virtual display

        // consumer that isn't processing buffers fast enough.

        status_t err = bufferProducer->setAsyncMode(true);
@@ -504,6 +505,7 @@ status_t Composer::setDisplaySurface(const sp<IBinder>& token, 
                    "display. (%d)", err);

            return err;

        }

    }

    Mutex::Autolock _l(mLock);

    DisplayState& s(getDisplayStateLocked(token));

    s.surface = bufferProducer;