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

Commit b078aef6 authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am b5c7ccfd: Merge "libgui: Change detachNextBuffer to return sp<GB>" 

* commit 'b5c7ccfd':
  libgui: Change detachNextBuffer to return sp<GB>
parents f4c64bb7 b5c7ccfd

include/gui/Surface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ public: 
    virtual int unlockAndPost();

    virtual int unlockAndPost();





    virtual int connect(int api, const sp<IProducerListener>& listener);

    virtual int connect(int api, const sp<IProducerListener>& listener);

    virtual int detachNextBuffer(ANativeWindowBuffer** outBuffer,

    virtual int detachNextBuffer(sp<GraphicBuffer>* outBuffer,

            sp<Fence>* outFence);

            sp<Fence>* outFence);

    virtual int attachBuffer(ANativeWindowBuffer*);

    virtual int attachBuffer(ANativeWindowBuffer*);

libs/gui/Surface.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -651,7 +651,7 @@ int Surface::disconnect(int api) { 
    return err;

    return err;

}

}





int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer,

int Surface::detachNextBuffer(sp<GraphicBuffer>* outBuffer,

        sp<Fence>* outFence) {

        sp<Fence>* outFence) {

    ATRACE_CALL();

    ATRACE_CALL();

    ALOGV("Surface::detachNextBuffer");

    ALOGV("Surface::detachNextBuffer");
@@ -670,7 +670,7 @@ int Surface::detachNextBuffer(ANativeWindowBuffer** outBuffer, 
        return result;

        return result;

    }

    }





    *outBuffer = buffer.get();

    *outBuffer = buffer;

    if (fence != NULL && fence->isValid()) {

    if (fence != NULL && fence->isValid()) {

        *outFence = fence;

        *outFence = fence;

    } else {

    } else {