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

Commit 299297a3 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22344 into eclair 

* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
parents cbd6b7f4 04bc12bd

libs/ui/Surface.cpp

+12 −2
Original line number Diff line number Diff line
@@ -602,7 +602,18 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer) 
    mBackbufferIndex = backIdx;

    layer_cblk_t* const lcblk = &(cblk->layers[index]);

    volatile const surface_info_t* const back = lcblk->surface + backIdx;

    if ((back->flags & surface_info_t::eNeedNewBuffer) || mUsageChanged) {



    const sp<SurfaceBuffer>& backBuffer(mBuffers[backIdx]);



    if (backBuffer==0 &&

            !((back->flags & surface_info_t::eNeedNewBuffer) || mUsageChanged)) {

        LOGW("dequeueBuffer: backbuffer is null, but eNeedNewBuffer "

                "is not set, fetching a buffer anyways...");

    }



    if ((back->flags & surface_info_t::eNeedNewBuffer) ||mUsageChanged ||

            backBuffer==0) 

    {

        mUsageChanged = false;

        err = getBufferLocked(backIdx, mUsage);

        if (err == NO_ERROR) {
@@ -614,7 +625,6 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer) 
    }



    if (err == NO_ERROR) {

        const sp<SurfaceBuffer>& backBuffer(mBuffers[backIdx]);

        if (backBuffer != 0) {

            mDirtyRegion.set(backBuffer->width, backBuffer->height);

            *buffer = backBuffer.get();