summaryrefslogtreecommitdiff
path: root/include/ui/GraphicBufferMapper.h
diff options
context:
space:
mode:
author Greg Hackmann <ghackmann@google.com> 2014-05-09 22:00:04 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-05-09 22:00:04 +0000
commit2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c (patch)
treec42170cdac8e30c84813a2723fbb89689b7d2463 /include/ui/GraphicBufferMapper.h
parent02528cf6aaedbbfec55be57d33389e1c57d88245 (diff)
parent9493d4924a59f14b698389386337a9c07a7ea3c4 (diff)
am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4': Revert "Use asynchronous lock/unlock API"
Diffstat (limited to 'include/ui/GraphicBufferMapper.h')
-rw-r--r--include/ui/GraphicBufferMapper.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/ui/GraphicBufferMapper.h b/include/ui/GraphicBufferMapper.h
index 98fff0ef31..99d872313f 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);