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

Commit 5a8cb035 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by android-build-merger
Browse files

Merge "Surface: Use buffer id to synchronize slots" into oc-dev am: adf0ad20 

am: fe614d7b

Change-Id: I24d58521c267ecf576160ac037d433c595c78960
parents bce1dead fe614d7b

libs/gui/Surface.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1231,7 +1231,7 @@ int Surface::detachNextBuffer(sp<GraphicBuffer>* outBuffer, 




    for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {

    for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {

        if (mSlots[i].buffer != NULL &&

        if (mSlots[i].buffer != NULL &&

                mSlots[i].buffer->handle == buffer->handle) {

                mSlots[i].buffer->getId() == buffer->getId()) {

            if (mReportRemovedBuffers) {

            if (mReportRemovedBuffers) {

                mRemovedBuffers.push_back(mSlots[i].buffer);

                mRemovedBuffers.push_back(mSlots[i].buffer);

            }

            }