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

Commit 66986783 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev

parents 4a803912 eddbef88

libs/gui/SurfaceComposerClient.cpp

+10 −8
Original line number Diff line number Diff line
@@ -475,6 +475,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);
@@ -484,6 +485,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;