Snap: CaptureModule: check if ZSL is supported before using it

Change-Id: Ifde34ce367ceeb19ad71bcff0c4518d578bb52a5

1 files changed, 27 insertions, 14 deletions

diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java
index 84198848b..43a791f92 100755
--- a/src/com/android/camera/imageprocessor/PostProcessor.java
+++ b/src/com/android/camera/imageprocessor/PostProcessor.java
@@ -139,7 +139,7 @@ public class PostProcessor{
     private CameraCaptureSession mCaptureSession;
     private ImageReader mImageReader;
     private ImageReader mZSLReprocessImageReader;
-    private boolean mUseZSL = true;
+    private boolean mUseZSL = false;
     private boolean mSaveRaw = false;
     private Handler mZSLHandler;
     private HandlerThread mZSLHandlerThread;
@@ -155,6 +155,14 @@ public class PostProcessor{
     public int mMaxRequiredImageNum;
     private boolean mIsDeepPortrait = false;
 
+    private void checkAndEnableZSL(int cameraId) {
+        if (mController.mSettingsManager.isZslSupported(cameraId)) {
+            mUseZSL = true;
+        } else {
+            mUseZSL = false;
+        }
+    }
+
     public int getMaxRequiredImageNum() {
         return mMaxRequiredImageNum;
     }
@@ -643,6 +651,7 @@ public class PostProcessor{
     public PostProcessor(CameraActivity activity, CaptureModule module) {
         mController = module;
         mActivity = activity;
+        checkAndEnableZSL(mController.getMainCameraId());
         mNamedImages = new PhotoModule.NamedImages();
     }
 
@@ -704,20 +713,24 @@ public class PostProcessor{
         mImageHandlerTask = new ImageHandlerTask();
         mSaveRaw = isSaveRaw;
         mIsDeepPortrait = isDeepPortrait;
-        if(setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn || isSelfieMirrorOn
-                || PersistUtil.getCameraZSLDisabled()
-                || !SettingsManager.getInstance().isZSLInAppEnabled()
-                || "enable".equals(
-                         SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR))
-                || SettingsManager.getInstance().isCamera2HDRSupport()
-                || "18".equals(SettingsManager.getInstance().getValue(
-                                  SettingsManager.KEY_SCENE_MODE))
-                || mController.getCameraMode() == CaptureModule.DUAL_MODE
-                || isSupportedQcfa || isDeepPortrait
-                || SettingsManager.getInstance().getSavePictureFormat() == SettingsManager.HEIF_FORMAT){
-            mUseZSL = false;
+        if (mController.mSettingsManager.isZslSupported(mController.getMainCameraId())) {
+            if (setFilter(postFilterId) || isFlashModeOn || isTrackingFocusOn || isMakeupOn
+                    || isSelfieMirrorOn || PersistUtil.getCameraZSLDisabled()
+                    || !SettingsManager.getInstance().isZSLInAppEnabled()
+                    || "enable".equals(
+                            SettingsManager.getInstance().getValue(SettingsManager.KEY_AUTO_HDR))
+                    || SettingsManager.getInstance().isCamera2HDRSupport()
+                    || "18".equals(
+                            SettingsManager.getInstance().getValue(SettingsManager.KEY_SCENE_MODE))
+                    || mController.getCameraMode() == CaptureModule.DUAL_MODE
+                    || isSupportedQcfa || isDeepPortrait
+                    || SettingsManager.getInstance().getSavePictureFormat() == SettingsManager.HEIF_FORMAT) {
+                mUseZSL = false;
+            } else {
+                mUseZSL = true;
+            }
         } else {
-            mUseZSL = true;
+            mUseZSL = false;
         }
         Log.d(TAG,"ZSL is "+mUseZSL);
         startBackgroundThread();