diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-04 20:21:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 20:21:14 -0700 |
| commit | ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb (patch) | |
| tree | 089714d6c07e5ec9e3bbf3cf5478c1dd264d8bc1 /include/surfaceflinger | |
| parent | 722665c5f76e81bed646490977ea30f38aaa00da (diff) | |
| parent | f461930872beb4362998642c115691bdd2e94617 (diff) | |
| download | frameworks_base-ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb.zip frameworks_base-ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb.tar.gz frameworks_base-ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb.tar.bz2 | |
am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp
* commit 'f461930872beb4362998642c115691bdd2e94617':
fix [2835280] Add support for cancelling buffers to ANativeWindow
Diffstat (limited to 'include/surfaceflinger')
| -rw-r--r-- | include/surfaceflinger/Surface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 7c5a39b..22684db 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -199,6 +199,7 @@ private: */ static int setSwapInterval(ANativeWindow* window, int interval); static int dequeueBuffer(ANativeWindow* window, android_native_buffer_t** buffer); + static int cancelBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int lockBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int queueBuffer(ANativeWindow* window, android_native_buffer_t* buffer); static int query(ANativeWindow* window, int what, int* value); @@ -207,6 +208,7 @@ private: int dequeueBuffer(android_native_buffer_t** buffer); int lockBuffer(android_native_buffer_t* buffer); int queueBuffer(android_native_buffer_t* buffer); + int cancelBuffer(android_native_buffer_t* buffer); int query(int what, int* value); int perform(int operation, va_list args); |