diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-27 14:27:45 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2014-09-27 14:27:45 -0700 |
| commit | 248f9ce1b6052889dd55e7701f908477d16d6ff4 (patch) | |
| tree | 1d9813a8cd8b634cfb4bf5e5f5a534234b99cee7 /services/camera | |
| parent | 5f5d0544454f062c1f37acad1a72d8c47b4a32b2 (diff) | |
| download | frameworks_av-248f9ce1b6052889dd55e7701f908477d16d6ff4.zip frameworks_av-248f9ce1b6052889dd55e7701f908477d16d6ff4.tar.gz frameworks_av-248f9ce1b6052889dd55e7701f908477d16d6ff4.tar.bz2 | |
CameraService: API1: Fix flash mode
Sometimes it's useful to ensure variables are initialized in
all code paths.
Bug: 17680416
Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 9818c96..7b90d28 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); |