diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-07-29 09:53:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-29 09:53:09 -0700 |
| commit | b7f09f28b92927ad5eb46f86e11a8a3df33ec914 (patch) | |
| tree | 9ca31dfa758b2a6c79743ff2889ad86c326eb36b /include | |
| parent | 5f7203eb258503bc5d2ba29176bdf483a68a93b8 (diff) | |
| parent | b7ed8471f1b96aff901149cf9ac29e4b32672f93 (diff) | |
| download | frameworks_base-b7f09f28b92927ad5eb46f86e11a8a3df33ec914.zip frameworks_base-b7f09f28b92927ad5eb46f86e11a8a3df33ec914.tar.gz frameworks_base-b7f09f28b92927ad5eb46f86e11a8a3df33ec914.tar.bz2 | |
am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
Adding an optional param to the SurfaceTexture constructor.
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/SurfaceTexture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 5a9e86f..946afb9 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -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) {} |