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

Commit 3a213480 authored by Jim Shargo's avatar Jim Shargo
Browse files

Revert "RingBufferConsumer - Remove unnecessary grab" 

This reverts commit fb5a3b76.

Reason for revert: caused tests to break b/390301197

ConsumerBase classes are required to set the graphic buffer in the
buffer item for things to work. This is, of course, unfortunate, but we
don't want people to be subclassing this anyway.

Change-Id: I948845b234b170a4942c7d463a2d03f9251f4a02
parent fb5a3b76

services/camera/libcameraservice/gui/RingBufferConsumer.cpp

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define LOG_TAG "RingBufferConsumer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <com_android_graphics_libgui_flags.h>

#include <inttypes.h>



#include <utils/Log.h>
@@ -318,9 +317,7 @@ void RingBufferConsumer::onFrameAvailable(const BufferItem& item) { 


        mLatestTimestamp = item.mTimestamp;



#if !COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_RING_BUFFER)

        item.mGraphicBuffer = mSlots[item.mSlot].mGraphicBuffer;

#endif

    } // end of mMutex lock



    ConsumerBase::onFrameAvailable(item);