gralloc1: Acquire mutex early in release am: 56ec3afb84 (883bf901) · Commits · e / os / android_frameworks_native-old

libs/ui/Gralloc1On0Adapter.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ gralloc1_error_t Gralloc1On0Adapter::allocateWithIdHook(
		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::retain(
		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 @@ gralloc1_error_t Gralloc1On0Adapter::release(
		}
		}

		std::lock_guard<std::mutex> lock(mBufferMutex);
		mBuffers.erase(handle);
		return GRALLOC1_ERROR_NONE;
		}