diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-09-11 07:41:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-11 07:41:37 -0700 |
| commit | e4f0da706a6706e3aaa3363d4de94551f30a3d22 (patch) | |
| tree | f2d858d3142cfbac733b881797cab91b903b28ff | |
| parent | f4750724cf8db972a052cb388dc9a39fc7aa6dd6 (diff) | |
| parent | 5b98d3a70d64c46b8d925415a30a7a7d8453d866 (diff) | |
| download | frameworks_base-e4f0da706a6706e3aaa3363d4de94551f30a3d22.zip frameworks_base-e4f0da706a6706e3aaa3363d4de94551f30a3d22.tar.gz frameworks_base-e4f0da706a6706e3aaa3363d4de94551f30a3d22.tar.bz2 | |
am 5b98d3a7: am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
* commit '5b98d3a70d64c46b8d925415a30a7a7d8453d866':
Added interface to SurfaceTexture needed by WebKit.
| -rw-r--r-- | include/gui/SurfaceTexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 2e2c74c..706ec99 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -34,6 +34,7 @@ struct SurfaceTexture { GLenum getCurrentTextureTarget() const { return 0; } void setBufferCount(int bufferCount) {} sp<GraphicBuffer> getCurrentBuffer() const { return NULL; } + int64_t getTimestamp() { return 0; } }; static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) |