diff options
| author | Alex Ray <aray@google.com> | 2012-10-08 16:21:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-08 16:21:43 -0700 |
| commit | 390bb827d50a1ba0d7df8e9f15eaebcb56e99b3c (patch) | |
| tree | aa52805a55b5840a22b24d03488f333d860f2527 /services/camera | |
| parent | 957126db7a5cec33a6ab113151ebc54d4dfd865b (diff) | |
| parent | 9ea63b3bfd696bcce9cb28e86218a3449dd699d8 (diff) | |
| download | frameworks_av-390bb827d50a1ba0d7df8e9f15eaebcb56e99b3c.zip frameworks_av-390bb827d50a1ba0d7df8e9f15eaebcb56e99b3c.tar.gz frameworks_av-390bb827d50a1ba0d7df8e9f15eaebcb56e99b3c.tar.bz2 | |
am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFF
* commit '9ea63b3bfd696bcce9cb28e86218a3449dd699d8':
Camera2: Set default flash mode to FLASH_OFF
Diffstat (limited to 'services/camera')
| -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 4ed17de..1c8585a 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 + |