commit d4913db492b5b4c55e11a80e646c7846ffffa2a6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 06 15:10:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 06 15:10:41 2017 +0000
tree c371af27358548074827251d5eef3e67bbd48a2c
parent 4073a0a3b4a6e32210d485197e6a447d23bcfac1
parent 3b630e53f324c90e07aaf8c58ff225d2fc1f039e

Merge "QCamera3: Disable HDR+ for front camera"

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 5680a51..26466c6 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -133,6 +133,9 @@
 // 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
 
@@ -5893,7 +5896,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 &&
@@ -9982,7 +9985,9 @@
     }
 
     if (gExposeEnableZslKey) {
-        available_request_keys.add(ANDROID_CONTROL_ENABLE_ZSL);
+        if (ENABLE_HDRPLUS_FOR_FRONT_CAMERA || cameraId == 0) {
+            available_request_keys.add(ANDROID_CONTROL_ENABLE_ZSL);
+        }
     }
 
     staticInfo.update(ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,