diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-09 21:46:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 21:46:44 +0000 |
| commit | 9eb142e34a5bc11508c0bd6f60ad3933c60aa530 (patch) | |
| tree | 60ead93b37ba9d8e790ea570335a4cd2ea01197e /include/ui/GraphicBuffer.h | |
| parent | 8a6cd189034ec4709a66e581b41deba56c028291 (diff) | |
| parent | a9d49f99e69d8fc0e60b492b131322c96f47a232 (diff) | |
| download | frameworks_native-9eb142e34a5bc11508c0bd6f60ad3933c60aa530.zip frameworks_native-9eb142e34a5bc11508c0bd6f60ad3933c60aa530.tar.gz frameworks_native-9eb142e34a5bc11508c0bd6f60ad3933c60aa530.tar.bz2 | |
am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
Diffstat (limited to 'include/ui/GraphicBuffer.h')
| -rw-r--r-- | include/ui/GraphicBuffer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index b973c40..3cf628c 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -97,11 +97,6 @@ public: status_t lockYCbCr(uint32_t usage, android_ycbcr *ycbcr); status_t lockYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr); status_t unlock(); - status_t lockAsync(uint32_t usage, void** vaddr, int fenceFd); - status_t lockAsync(uint32_t usage, const Rect& rect, void** vaddr, int fenceFd); - status_t lockAsyncYCbCr(uint32_t usage, android_ycbcr *ycbcr, int fenceFd); - status_t lockAsyncYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr, int fenceFd); - status_t unlockAsync(int *fenceFd); ANativeWindowBuffer* getNativeBuffer() const; |