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

Commit fe614d7b 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

Change-Id: I01b8012c941001530678f944670a083e34b7ebc6
parents 1ae167be adf0ad20

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);

            }

            }