summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
commitbbfbd30383bb8410604f257512a206c2d672776b (patch)
tree6e6126c3b2b286e80b7124237b581801ae35c84f
parent15c8cd406b5b16533555e793c501a1efbd57579f (diff)
parentadbba1fda08cd19355a11857f06be0c3e10e7532 (diff)
am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93': Adding an optional param to the SurfaceTexture constructor.
-rw-r--r--include/gui/SurfaceTexture.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 5a9e86f5f6..946afb980f 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) {}