From 6f854608d26d7abcce5e46396c7260ed7b250653 Mon Sep 17 00:00:00 2001 From: Alex Ray Date: Mon, 8 Oct 2012 12:04:15 -0700 Subject: Camera2: Set default flash mode to FLASH_OFF Bug: 6970090 Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c --- services/camera/libcameraservice/camera2/Parameters.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'services') diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 4d511208..91466eea 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -542,9 +542,9 @@ status_t Parameters::initialize(const CameraMetadata *info) { if (!availableAeModes.count) return NO_INIT; if (flashAvailable.data.u8[0]) { - flashMode = Parameters::FLASH_MODE_AUTO; + flashMode = Parameters::FLASH_MODE_OFF; params.set(CameraParameters::KEY_FLASH_MODE, - CameraParameters::FLASH_MODE_AUTO); + CameraParameters::FLASH_MODE_OFF); String8 supportedFlashModes(CameraParameters::FLASH_MODE_OFF); supportedFlashModes = supportedFlashModes + -- cgit v1.2.3