summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-05-09 21:36:48 +0000
committerGreg Hackmann <ghackmann@google.com>2014-05-09 21:36:48 +0000
commit53ec72523a4083b88eaa13e2e720976523a7ebf8 (patch)
tree395d153602527e425922cb3fc1ac309364eac0e5 /include/ui
parent378ef07760eda717367d9429428c42d54d54d9a7 (diff)
downloadframeworks_native-53ec72523a4083b88eaa13e2e720976523a7ebf8.zip
frameworks_native-53ec72523a4083b88eaa13e2e720976523a7ebf8.tar.gz
frameworks_native-53ec72523a4083b88eaa13e2e720976523a7ebf8.tar.bz2
Revert "Use asynchronous lock/unlock API"
This reverts commit 378ef07760eda717367d9429428c42d54d54d9a7. Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/GraphicBuffer.h5
-rw-r--r--include/ui/GraphicBufferMapper.h8
2 files changed, 0 insertions, 13 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;
diff --git a/include/ui/GraphicBufferMapper.h b/include/ui/GraphicBufferMapper.h
index 98fff0e..99d8723 100644
--- a/include/ui/GraphicBufferMapper.h
+++ b/include/ui/GraphicBufferMapper.h
@@ -49,14 +49,6 @@ public:
int usage, const Rect& bounds, android_ycbcr *ycbcr);
status_t unlock(buffer_handle_t handle);
-
- status_t lockAsync(buffer_handle_t handle,
- int usage, const Rect& bounds, void** vaddr, int fenceFd);
-
- status_t lockAsyncYCbCr(buffer_handle_t handle,
- int usage, const Rect& bounds, android_ycbcr *ycbcr, int fenceFd);
-
- status_t unlockAsync(buffer_handle_t handle, int *fenceFd);
// dumps information about the mapping of this handle
void dump(buffer_handle_t handle);