summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-08-11 12:19:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-11 12:19:44 -0700
commit44874c236de282b0d898f179fc9fdafa84aae40d (patch)
tree09f66d4e5101a7ce2ae71068db7d5f85c03c818c
parentca97671e2b74ed31b5bef6fd0b39e489f1ec5f51 (diff)
parentc962512cac19e2bb1103c0c1a5f739d40d4d7740 (diff)
downloadframeworks_base-44874c236de282b0d898f179fc9fdafa84aae40d.zip
frameworks_base-44874c236de282b0d898f179fc9fdafa84aae40d.tar.gz
frameworks_base-44874c236de282b0d898f179fc9fdafa84aae40d.tar.bz2
am c962512c: Merge "added stub for getting buffer from surface texture"
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740': added stub for getting buffer from surface texture
-rw-r--r--include/gui/SurfaceTexture.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index ec62b96..140fbed 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -31,6 +31,7 @@ struct SurfaceTexture {
void setSynchronousMode(bool) {}
GLenum getCurrentTextureTarget() const { return 0; }
void setBufferCount(int bufferCount) {}
+ sp<GraphicBuffer> getCurrentBuffer() const { return NULL; }
};
static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)