am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."

* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
This commit is contained in:
Derek Sollenberger 2011-07-29 09:53:09 -07:00 committed by Android Git Automerger
commit bbfbd30383

View File

@ -22,7 +22,7 @@ namespace android {
struct SurfaceTexture {
struct FrameAvailableListener : public virtual RefBase {};
SurfaceTexture(GLuint) {}
SurfaceTexture(GLuint, bool allowSynchronousMode = true) {}
void updateTexImage() {}
void decStrong(android::sp<android::SurfaceTexture>* const) {}
void incStrong(android::sp<android::SurfaceTexture>* const) {}