QCameraHWI: Disable HDR+ client in flush
Disable HDR+ client before stopping all HAL channels to
make sure that all buffers sent to Easel have returned
and Easel has stopped MIPI capturing.
Test: CTS
Bug: 65543845
Change-Id: I0a023eda45b44cb34a0381ac62eb55ba749e83c7
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index d711cdc..8d2871b 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1809,7 +1809,7 @@
return rc;
}
- // Disable HRD+ if it's enabled;
+ // Disable HDR+ if it's enabled;
{
std::unique_lock<std::mutex> l(gHdrPlusClientLock);
finishHdrPlusClientOpeningLocked(l);
@@ -6305,6 +6305,13 @@
mFlush = true;
pthread_mutex_unlock(&mMutex);
+ // Disable HDR+ if it's enabled;
+ {
+ std::unique_lock<std::mutex> l(gHdrPlusClientLock);
+ finishHdrPlusClientOpeningLocked(l);
+ disableHdrPlusModeLocked();
+ }
+
rc = stopAllChannels();
// unlink of dualcam
if (mIsDeviceLinked) {