diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-06 17:07:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 17:07:39 -0700 |
| commit | 499f518400d54f2f14753a674edd95c5bb11acfd (patch) | |
| tree | 4a985755f7752b22cdea5d7cbaa4f5417d53da65 /include/surfaceflinger | |
| parent | 7930b5bc068e92a1eaaa6c890b77aebbdf01e259 (diff) | |
| parent | ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb (diff) | |
| download | frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.zip frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.tar.gz frameworks_base-499f518400d54f2f14753a674edd95c5bb11acfd.tar.bz2 | |
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 a210880..cef439c 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); |