commit a68765fb88ee78d86490f8987f3f46ff4bb4a266
author Camera Software Integration <camswint@localhost> Thu Mar 09 06:39:46 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 09 06:39:46 2017 -0800
tree bfa24a652f7e1543fff7e94d39e84c4070f1a1a0
parent 225e9d7cdc7e17159af790cc1a30d44062015114
parent a679df892433f8847eb41c89c6a5e846fa0b2883

Merge "SnapdragonCamera: ZSL and manual 3A can be on at same time" into camera.lnx.1.0-dev.1.0

src/com/android/camera/PhotoMenu.java

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index eb3f413..f1ba938 100755
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -704,12 +704,7 @@
         if ((autohdr != null) && autohdr.equals("enable")) {
             popup1.setPreferenceEnabled(CameraSettings.KEY_SCENE_MODE, false);
         }
-        if ((zsl != null) && Parameters.ZSL_ON.equals(zsl)) {
-            popup1.setPreferenceEnabled(CameraSettings.KEY_FOCUS_MODE, false);
-            popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_EXPOSURE, false);
-            popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_WB, false);
-            popup1.setPreferenceEnabled(CameraSettings.KEY_MANUAL_FOCUS, false);
-        }
+
         if ((faceDetection != null) && !Parameters.FACE_DETECTION_ON.equals(faceDetection)) {
             popup1.setPreferenceEnabled(CameraSettings.KEY_FACE_RECOGNITION, false);
         }