diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 8e6c7f5ec..733bf6954 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1893,9 +1893,9 @@ public class CaptureModule implements CameraModule, PhotoController, Log.d(TAG, "takePicture"); mUI.enableShutter(false); if ((mSettingsManager.isZSLInHALEnabled() && - !isFlashOn(getMainCameraId()) && + !isFlashOn(getMainCameraId()) && (mPreviewCaptureResult != null && mPreviewCaptureResult.get(CaptureResult.CONTROL_AE_STATE) != - CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED) || + CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED)) || isActionImageCapture()) { takeZSLPictureInHAL(); } else { @@ -2145,7 +2145,7 @@ public class CaptureModule implements CameraModule, PhotoController, Message message = mCameraHandler.obtainMessage(CANCEL_TOUCH_FOCUS, id, 0, mCameraId[id]); mCameraHandler.sendMessageDelayed(message, CANCEL_TOUCH_FOCUS_DELAY); - } catch (CameraAccessException | IllegalStateException e) { + } catch (CameraAccessException | IllegalStateException | IllegalArgumentException e) { e.printStackTrace(); } } |