diff options
| author | Dan Stoza <stoza@google.com> | 2015-03-19 17:45:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-19 17:45:26 +0000 |
| commit | ad36432de81c4c88d726680b7c52e8357df98455 (patch) | |
| tree | fdba6eb241c08e9d45a612cff3f8cea9202dfe73 /libs/gui | |
| parent | c193063050e6be193838527fb8bc7a4588bfdc22 (diff) | |
| parent | 966b98bd86abc6473167bc98ddf8ddb1f8dd2ed5 (diff) | |
| download | frameworks_native-ad36432de81c4c88d726680b7c52e8357df98455.zip frameworks_native-ad36432de81c4c88d726680b7c52e8357df98455.tar.gz frameworks_native-ad36432de81c4c88d726680b7c52e8357df98455.tar.bz2 | |
Merge "Surface: Permit an IProducerListener on connect"
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/Surface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index aa4aee4..98489b1 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -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); |