From 966b98bd86abc6473167bc98ddf8ddb1f8dd2ed5 Mon Sep 17 00:00:00 2001
From: Dan Stoza <stoza@google.com>
Date: Mon, 2 Mar 2015 22:12:37 -0800
Subject: [PATCH] Surface: Permit an IProducerListener on connect

This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer.

Cherry pick of I5ea5229bf3a329bf02c6bd20e7247039c75d136b

Change-Id: I6f8f52c72654e4cee649721383819bafe378f964
---
 include/gui/Surface.h | 1 +
 libs/gui/Surface.cpp  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index 98f4f4f6a..863f22bb0 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -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);
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index aa4aee4b2..98489b1fe 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);