diff options
| author | 2010-10-06 17:07:39 -0700 | |
|---|---|---|
| committer | 2010-10-06 17:07:39 -0700 | |
| commit | e1c290b97d4e34a4f1938ebee30eab6678b06c2a (patch) | |
| tree | 84bdf76b4c62e93196d25480e2426d5f09be8079 /include/surfaceflinger | |
| parent | fbd5d01528406e5a29d2ab551a2cf2996c891fe2 (diff) | |
| parent | 8a4dfa9661eaa05029ed02b1962147370b89f3f8 (diff) | |
am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'
* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
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 a2108804af..cef439c170 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -200,6 +200,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); @@ -208,6 +209,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); |