diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-09-27 22:38:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-27 22:38:21 +0000 |
| commit | a67ced9746e6f0d4e03ff8007682091afea71f6c (patch) | |
| tree | 3e038561671d256e03d63fb88a32e529e198701a /services/camera | |
| parent | a8a4eeb95988e6bb73f7a742c8dd238c1f96c5c4 (diff) | |
| parent | 248f9ce1b6052889dd55e7701f908477d16d6ff4 (diff) | |
| download | frameworks_av-a67ced9746e6f0d4e03ff8007682091afea71f6c.zip frameworks_av-a67ced9746e6f0d4e03ff8007682091afea71f6c.tar.gz frameworks_av-a67ced9746e6f0d4e03ff8007682091afea71f6c.tar.bz2 | |
Merge "CameraService: API1: Fix flash mode" into lmp-dev
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); |