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

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

am ad36432d: Merge "Surface: Permit an IProducerListener on connect" 

* commit 'ad36432d':
  Surface: Permit an IProducerListener on connect
parents 42f0ce10 ad36432d

include/gui/Surface.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ protected: 


    virtual int lockBuffer_DEPRECATED(ANativeWindowBuffer* buffer);



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

    virtual int connect(int api);

    virtual int disconnect(int api);

    virtual int setBufferCount(int bufferCount);

libs/gui/Surface.cpp

+5 −1
Original line number Diff line number Diff line
@@ -547,9 +547,13 @@ int Surface::dispatchSetSidebandStream(va_list args) { 
}



int Surface::connect(int api) {

    static sp<IProducerListener> listener = new DummyProducerListener();

    return connect(api, listener);

}



int Surface::connect(int api, const sp<IProducerListener>& listener) {

    ATRACE_CALL();

    ALOGV("Surface::connect");

    static sp<IProducerListener> listener = new DummyProducerListener();

    Mutex::Autolock lock(mMutex);

    IGraphicBufferProducer::QueueBufferOutput output;

    int err = mGraphicBufferProducer->connect(listener, api, mProducerControlledByApp, &output);