summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilian Peev <epeev@google.com>2017-09-22 18:57:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-22 18:57:34 +0000
commit456c79eb567461dbf32dac3eb8a37fafae1f26d9 (patch)
treecd6199a768b94b9ba4810053e8023ee93f9255f7
parent64af5e9b1a78d981de454f8f9ef538cf0b20b347 (diff)
parent9f6e6392f6e7e0b9e219f2861547b78e4c385146 (diff)
downloadangler-456c79eb567461dbf32dac3eb8a37fafae1f26d9.tar.gz
QCamera2: HAL3: Avoid race condition during HFR video stop
am: 9f6e6392f6 Change-Id: I6a38c83f534863f2966ecf4022ecf5866b49f408
-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: