diff options
| author | Mathias Agopian <mathias@google.com> | 2010-03-25 14:34:49 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-03-25 14:34:49 -0700 |
| commit | dc5ce9c548533e0c149e7a5b2a0597f321905bef (patch) | |
| tree | 4f52e51d520c96393d1ebad1f8a021caa012f9ac /libs/ui/GraphicBufferAllocator.cpp | |
| parent | b80d49d33831ad95e6cddd2aa0903a25cd838f93 (diff) | |
| download | frameworks_base-dc5ce9c548533e0c149e7a5b2a0597f321905bef.zip frameworks_base-dc5ce9c548533e0c149e7a5b2a0597f321905bef.tar.gz frameworks_base-dc5ce9c548533e0c149e7a5b2a0597f321905bef.tar.bz2 | |
fix [2545826] calling into gralloc with external lock held
Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a
Diffstat (limited to 'libs/ui/GraphicBufferAllocator.cpp')
| -rw-r--r-- | libs/ui/GraphicBufferAllocator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp index 57d5fc3..6ae7e74 100644 --- a/libs/ui/GraphicBufferAllocator.cpp +++ b/libs/ui/GraphicBufferAllocator.cpp @@ -78,8 +78,6 @@ static inline uint32_t clamp(uint32_t c) { status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat format, int usage, buffer_handle_t* handle, int32_t* stride) { - Mutex::Autolock _l(mLock); - // make sure to not allocate a 0 x 0 buffer w = clamp(w); h = clamp(h); @@ -118,8 +116,6 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma status_t GraphicBufferAllocator::free(buffer_handle_t handle) { - Mutex::Autolock _l(mLock); - status_t err; if (sw_gralloc_handle_t::validate(handle) < 0) { err = mAllocDev->free(mAllocDev, handle); |