ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* commit 'ad36432de81c4c88d726680b7c52e8357df98455':
  Surface: Permit an IProducerListener on connect
This commit is contained in:
Dan Stoza 2015-03-19 17:56:44 +00:00 committed by Android Git Automerger
parent 42f0ce1075 ad36432de8
commit 663eaf422d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/gui/Surface.h
View File

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

6
libs/gui/Surface.cpp
View File

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