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

Commit ee87482e authored by Fabien Sanglard's avatar Fabien Sanglard Committed by android-build-merger
Browse files

Merge "Fix surfaceflinger file descriptor leak" 

am: af2fbb0c

Change-Id: If21d062e144dd13064c0c3e8021523a8bf20b864
parents 01d63343 af2fbb0c

services/surfaceflinger/SurfaceFlingerConsumer.cpp

+8 −8
Original line number Diff line number Diff line
@@ -70,6 +70,14 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter, 
        return err;

    }



    if (autoRefresh) {

        *autoRefresh = item.mAutoRefresh;

    }



    if (queuedBuffer) {

        *queuedBuffer = item.mQueuedBuffer;

    }



    // We call the rejecter here, in case the caller has a reason to

    // not accept this buffer.  This is used by SurfaceFlinger to

    // reject buffers which have the wrong size
@@ -79,14 +87,6 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter, 
        return BUFFER_REJECTED;

    }



    if (autoRefresh) {

        *autoRefresh = item.mAutoRefresh;

    }



    if (queuedBuffer) {

        *queuedBuffer = item.mQueuedBuffer;

    }



    // Release the previous buffer.

#ifdef USE_HWC2

    err = updateAndReleaseLocked(item, &mPendingRelease);