Revert "QCamera3: Disable HDR+ for front camera"
This reverts commit 3b630e53f324c90e07aaf8c58ff225d2fc1f039e.
Bug: 37100623
Change-Id: I7df92c220b6589f9af13f8b86e77a3e29470f615
diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 357a1f5..871f8cb 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -133,9 +133,6 @@
// Max preferred zoom
#define MAX_PREFERRED_ZOOM_RATIO 7.0
-// TODO: Enable HDR+ for front camera after it's supported. b/37100623.
-#define ENABLE_HDRPLUS_FOR_FRONT_CAMERA 0
-
// Whether to check for the GPU stride padding, or use the default
//#define CHECK_GPU_PIXEL_ALIGNMENT
@@ -5877,7 +5874,7 @@
}
// Enable HDR+ mode for the first PREVIEW_INTENT request.
- if (ENABLE_HDRPLUS_FOR_FRONT_CAMERA || mCameraId == 0) {
+ {
Mutex::Autolock l(gHdrPlusClientLock);
if (gEaselManagerClient.isEaselPresentOnDevice() &&
!gEaselBypassOnly && !mFirstPreviewIntentSeen &&
@@ -9966,9 +9963,7 @@
}
if (gExposeEnableZslKey) {
- if (ENABLE_HDRPLUS_FOR_FRONT_CAMERA || cameraId == 0) {
- available_request_keys.add(ANDROID_CONTROL_ENABLE_ZSL);
- }
+ available_request_keys.add(ANDROID_CONTROL_ENABLE_ZSL);
}
staticInfo.update(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,