commit 5a478c28b24693f84079f58b2b3cd0d106081b2d
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 14 10:41:23 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 14 10:41:23 2019 -0700
tree f7087e6c5e6494434a1f23674c47106a34db2b29
parent d43f6021c92a0ae14d9e23183e2456843a711dff
parent 1e9cb0add9c5e5b0a2fe953aa12b84e6440bdf51

Merge "fix camera app cannot handle intent extras.CAMERA_FACING" into camera-SnapdragonCamera.lnx.2.0

src/com/android/camera/CaptureModule.java

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9e340a0..3ea6676 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1899,12 +1899,11 @@
     private void takePicture() {
         Log.d(TAG, "takePicture");
         mUI.enableShutter(false);
-        if ((mSettingsManager.isZSLInHALEnabled() &&
+        if ((mSettingsManager.isZSLInHALEnabled() || isActionImageCapture()) &&
                 !isFlashOn(getMainCameraId()) && (mPreviewCaptureResult != null &&
                 mPreviewCaptureResult.get(CaptureResult.CONTROL_AE_STATE) !=
                      CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED &&
-                mPreviewCaptureResult.getRequest().get(CaptureRequest.CONTROL_AE_LOCK) != Boolean.TRUE)) ||
-                isActionImageCapture()) {
+                mPreviewCaptureResult.getRequest().get(CaptureRequest.CONTROL_AE_LOCK) != Boolean.TRUE)) {
             takeZSLPictureInHAL();
         } else {
             if (isBackCamera()) {
@@ -3545,17 +3544,13 @@
             mFrameProcessor.onOpen(getFrameProcFilterId(), mPreviewSize);
         }
 
-        if(mPostProcessor.isZSLEnabled()) {
+        if(mPostProcessor.isZSLEnabled() && !isActionImageCapture()) {
             mChosenImageFormat = ImageFormat.PRIVATE;
         } else if(mPostProcessor.isFilterOn() || getFrameFilters().size() != 0 || mPostProcessor.isSelfieMirrorOn()) {
             mChosenImageFormat = ImageFormat.YUV_420_888;
         } else {
             mChosenImageFormat = ImageFormat.JPEG;
         }
-        // if intent action is ACTION_IMAGE_CAPTURE, use HAL-ZSL to capture
-        if (isActionImageCapture()) {
-            mChosenImageFormat = ImageFormat.JPEG;
-        }
         setUpCameraOutputs(mChosenImageFormat);
 
     }