diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-27 22:43:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-27 22:43:11 +0000 |
| commit | a9e3132f66b307a162d5899290d38abb7a59166b (patch) | |
| tree | de921e41ebd4c0ea0beb2e4d272eacc49ba37fae /services | |
| parent | cc0d24f30e3d2c50a9f0082af64ce7ce3e1e9109 (diff) | |
| parent | a67ced9746e6f0d4e03ff8007682091afea71f6c (diff) | |
| download | frameworks_av-a9e3132f66b307a162d5899290d38abb7a59166b.zip frameworks_av-a9e3132f66b307a162d5899290d38abb7a59166b.tar.gz frameworks_av-a9e3132f66b307a162d5899290d38abb7a59166b.tar.bz2 | |
am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-dev
* commit 'a67ced9746e6f0d4e03ff8007682091afea71f6c':
CameraService: API1: Fix flash mode
Diffstat (limited to 'services')
| -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); |