commit be4ccdcdd5988948a7876af0d1f621840a36eaa1
author Dan Stoza <stoza@google.com> Thu Mar 19 18:04:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 19 18:04:45 2015 +0000
tree bbdc156b07894672da188337c3370dca2d93afa0
parent 4927d3a492c24cf992b8f033922cbb493dc76174
parent 663eaf422d325768808b416d66ecd4648bb14799

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

* commit '663eaf422d325768808b416d66ecd4648bb14799':
  Surface: Permit an IProducerListener on connect

include/gui/Surface.h

diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index e973483..6968202 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -158,6 +158,7 @@
 
     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);