diff options
| author | Alex Ray <aray@google.com> | 2012-10-08 12:04:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 14:05:56 -0700 |
| commit | 2814a4dc0dd45007ce62871af08b98214cd1692c (patch) | |
| tree | 31454ee4ba8e96f1fee1bed35d91b1125d35903b /services | |
| parent | 07cc78fe7dee9a96cd33865de890d0890fe752d7 (diff) | |
| download | frameworks_av-2814a4dc0dd45007ce62871af08b98214cd1692c.zip frameworks_av-2814a4dc0dd45007ce62871af08b98214cd1692c.tar.gz frameworks_av-2814a4dc0dd45007ce62871af08b98214cd1692c.tar.bz2 | |
Camera2: Set default flash mode to FLASH_OFF
Bug: 6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 4d51120..91466ee 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 + |