diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-06-18 09:45:53 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-06-18 09:45:53 -0700 |
| commit | e3b05d09163257b888c86f2a560e10c48f4cf029 (patch) | |
| tree | 31114334ea83202c54e73e1f478ee7bede50efcb /include | |
| parent | d8b027b18f5a922ef729c6ee363eecb053358d47 (diff) | |
| parent | 84d0ccf16cccf02d5cab51c0cb6c9cee79b60f3f (diff) | |
| download | frameworks_base-e3b05d09163257b888c86f2a560e10c48f4cf029.zip frameworks_base-e3b05d09163257b888c86f2a560e10c48f4cf029.tar.gz frameworks_base-e3b05d09163257b888c86f2a560e10c48f4cf029.tar.bz2 | |
Merge "Tweaks for forward-compatibility"
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/SurfaceTexture.h | 1 | ||||
| -rw-r--r-- | include/ui/GraphicBuffer.h | 2 | ||||
| -rw-r--r-- | include/ui/android_native_buffer.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index 255afdd..f5f9ea7 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -28,6 +28,7 @@ struct SurfaceTexture { void incStrong(android::sp<android::SurfaceTexture>* const) {} void getTransformMatrix(float mtx[16]) {} void setFrameAvailableListener(const sp<FrameAvailableListener>&) {} + void setSynchronousMode(bool) {} }; static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 0be26a7..1da9729 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -74,6 +74,8 @@ public: GraphicBuffer(); + GraphicBuffer(android_native_buffer_t*, bool); + // creates w * h buffer GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage); diff --git a/include/ui/android_native_buffer.h b/include/ui/android_native_buffer.h index a472824..85a1638 100644 --- a/include/ui/android_native_buffer.h +++ b/include/ui/android_native_buffer.h @@ -63,6 +63,7 @@ typedef struct android_native_buffer_t void* reserved_proc[8]; } android_native_buffer_t; +#define ANativeWindowBuffer android_native_buffer_t /*****************************************************************************/ |