commit 37aa42d24b157401df3a4e31c1e005f718e2efc0
author Ajit Kumar <kajit@qti.qualcomm.com> Thu Dec 29 21:56:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 29 21:56:44 2016 +0000
tree ad52e84fbee08d956b930f188136137427f9c3f4
parent 430f62090cefe4630794873e30390433ad3e49a7
parent 56ec3afb8444a9a7056b54601bb6031465113621

gralloc1: Acquire mutex early in release
am: 56ec3afb84

Change-Id: Iffcf6f2f95e9b70797080ceb6267679ec2e7e1a3

libs/ui/Gralloc1On0Adapter.cpp

diff --git a/libs/ui/Gralloc1On0Adapter.cpp b/libs/ui/Gralloc1On0Adapter.cpp
index d5b88de..ec7df31 100644
--- a/libs/ui/Gralloc1On0Adapter.cpp
+++ b/libs/ui/Gralloc1On0Adapter.cpp
@@ -288,6 +288,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;
 }
@@ -295,6 +296,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;
     }
@@ -314,7 +316,6 @@
         }
     }
 
-    std::lock_guard<std::mutex> lock(mBufferMutex);
     mBuffers.erase(handle);
     return GRALLOC1_ERROR_NONE;
 }