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

* commit '663eaf422d325768808b416d66ecd4648bb14799':
  Surface: Permit an IProducerListener on connect
This commit is contained in:
Dan Stoza 2015-03-19 18:04:45 +00:00 committed by Android Git Automerger
commit be4ccdcdd5

View File

@ -158,6 +158,7 @@ protected:
virtual int lockBuffer_DEPRECATED(ANativeWindowBuffer* buffer); virtual int lockBuffer_DEPRECATED(ANativeWindowBuffer* buffer);
virtual int connect(int api, const sp<IProducerListener>& listener);
virtual int connect(int api); virtual int connect(int api);
virtual int disconnect(int api); virtual int disconnect(int api);
virtual int setBufferCount(int bufferCount); virtual int setBufferCount(int bufferCount);