diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-07-29 09:50:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-29 09:50:11 -0700 |
| commit | b7ed8471f1b96aff901149cf9ac29e4b32672f93 (patch) | |
| tree | a71b648bae8012050c4fa9f73e132c595a763c02 /include | |
| parent | 5a27a7543edbd09a56e36d04adb4cfab922e6346 (diff) | |
| parent | 01caec8c4165a6cce2f276f8016b9eadab966944 (diff) | |
| download | frameworks_base-b7ed8471f1b96aff901149cf9ac29e4b32672f93.zip frameworks_base-b7ed8471f1b96aff901149cf9ac29e4b32672f93.tar.gz frameworks_base-b7ed8471f1b96aff901149cf9ac29e4b32672f93.tar.bz2 | |
am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
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) {} |