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

Commit cd939aa6 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Fix build for non-HWC2 targets 

Fix build error introduced by ag/2528660
Test: lunch mini_x86-userdebug; make

Change-Id: I39b758c6456a6f334479ec4aed97db1659823a8b
parent 79d27244

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+5 −6
Original line number Diff line number Diff line
@@ -174,18 +174,17 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& 
#ifdef USE_HWC2

    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

            &outSlot, &outBuffer);

    outDataspace = item.mDataSpace;

#else

    outBuffer = mCurrentBuffer;

#endif

    status_t result =

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

    if (result != NO_ERROR) {

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

    }



        return result;

    }

#else

    outBuffer = mCurrentBuffer;

#endif

    return NO_ERROR;

}



#ifndef USE_HWC2

// Overrides ConsumerBase::onFrameAvailable(), does not call base class impl.