From 248f9ce1b6052889dd55e7701f908477d16d6ff4 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Sat, 27 Sep 2014 14:27:45 -0700 Subject: [PATCH] CameraService: API1: Fix flash mode Sometimes it's useful to ensure variables are initialized in all code paths. Bug: 17680416 Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577 --- services/camera/libcameraservice/api1/client2/Parameters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 9818c96ded..7b90d28fce 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -622,8 +622,8 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { camera_metadata_ro_entry_t availableAeModes = staticInfo(ANDROID_CONTROL_AE_AVAILABLE_MODES, 0, 0, false); + flashMode = Parameters::FLASH_MODE_OFF; if (isFlashAvailable) { - flashMode = Parameters::FLASH_MODE_OFF; params.set(CameraParameters::KEY_FLASH_MODE, CameraParameters::FLASH_MODE_OFF); -- 2.11.0