summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilian Peev <epeev@google.com>2017-09-22 18:57:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-22 18:57:53 +0000
commit4821da19d789695669393d8962eea2e976f4bf4d (patch)
treea954d007b2b974fce60499c196153a772f033e16
parent57b0a0a1f969960c419918ba2c55fbb8081b3920 (diff)
parent18f48fce3e756c0efc0197da3f0b829183cd0189 (diff)
downloadbullhead-4821da19d789695669393d8962eea2e976f4bf4d.tar.gz
QCamera2: HAL3: Avoid race condition during HFR video stop
am: 18f48fce3e Change-Id: Ia20ea601908190eee932580028cc3c58467423f6
-rw-r--r--camera/QCamera2/HAL3/QCamera3Stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3Stream.cpp b/camera/QCamera2/HAL3/QCamera3Stream.cpp
index 399e73d..e87d1ec 100644
--- a/camera/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Stream.cpp
@@ -588,9 +588,9 @@ void *QCamera3Stream::dataProcRoutine(void *data)
break;
case CAMERA_CMD_TYPE_EXIT:
CDBG_HIGH("%s: Exit", __func__);
+ pme->flushFreeBatchBufQ();
/* flush data buf queue */
pme->mDataQ.flush();
- pme->flushFreeBatchBufQ();
running = 0;
break;
default: