commit c42324fce76d357120bf86de0864bd11d3f31385
author Ajit Kumar <kajit@qti.qualcomm.com> Thu Dec 29 22:12:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 29 22:12:46 2016 +0000
tree de2ecb0fbd99a6899e5fd72f0e25ce9132fdad44
parent 02400591d3f61ec73fd959f2977f496124df708e
parent 3dc5241752075184e2d5711cd58a23476a25b7f6

gralloc1: Acquire mutex early in release am: 56ec3afb84 am: 37aa42d24b
am: 3dc5241752

Change-Id: If6ce570aef96611e1c820081c3e56e91aab3e159

libs/ui/Gralloc1On0Adapter.cpp

diff --git a/libs/ui/Gralloc1On0Adapter.cpp b/libs/ui/Gralloc1On0Adapter.cpp
index 111879a..a0bbe63 100644
--- a/libs/ui/Gralloc1On0Adapter.cpp
+++ b/libs/ui/Gralloc1On0Adapter.cpp
@@ -294,6 +294,7 @@
 gralloc1_error_t Gralloc1On0Adapter::retain(
         const std::shared_ptr<Buffer>& buffer)
 {
+    std::lock_guard<std::mutex> lock(mBufferMutex);
     buffer->retain();
     return GRALLOC1_ERROR_NONE;
 }
@@ -301,6 +302,7 @@
 gralloc1_error_t Gralloc1On0Adapter::release(
         const std::shared_ptr<Buffer>& buffer)
 {
+    std::lock_guard<std::mutex> lock(mBufferMutex);
     if (!buffer->release()) {
         return GRALLOC1_ERROR_NONE;
     }
@@ -320,7 +322,6 @@
         }
     }
 
-    std::lock_guard<std::mutex> lock(mBufferMutex);
     mBuffers.erase(handle);
     return GRALLOC1_ERROR_NONE;
 }