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

Commit e71c01d8 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter Committed by android-build-merger
Browse files

Merge "Fix build error from diamond merge" 

am: 52da663d

Change-Id: I682221893b962f5dc9deea94f48029be397e7cce
parents 6fb31e8e 52da663d

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -173,16 +173,17 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& 
    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

            &outSlot, &outBuffer);

            &outSlot, &outBuffer);

    outDataspace = item.mDataSpace;

    outDataspace = item.mDataSpace;

#else

    outBuffer = mCurrentBuffer;

#endif

    status_t result =

    status_t result =

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

    if (result != NO_ERROR) {

    if (result != NO_ERROR) {

        ALOGE("error posting framebuffer: %d", result);

        ALOGE("error posting framebuffer: %d", result);

        return result;

    }

    }

#else

    outBuffer = mCurrentBuffer;

#endif





    return result;

    return NO_ERROR;

}

}





#ifndef USE_HWC2

#ifndef USE_HWC2