diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-05 11:24:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-05 11:24:09 -0700 |
| commit | cc1abea590b8d3f9b9707b3442aea02cd2b4fcef (patch) | |
| tree | 5b5346eed27b3a188ba118f076edd8ecd779b071 /services/camera/libcameraservice/camera2/Parameters.cpp | |
| parent | 3b716883db5fb5e2cae20ad4c3f1c6ff445a7371 (diff) | |
| parent | ee5293f8dc1d438873fdefa19d3842e2889f1029 (diff) | |
| download | frameworks_av-cc1abea590b8d3f9b9707b3442aea02cd2b4fcef.zip frameworks_av-cc1abea590b8d3f9b9707b3442aea02cd2b4fcef.tar.gz frameworks_av-cc1abea590b8d3f9b9707b3442aea02cd2b4fcef.tar.bz2 | |
am e5f4024b: am 95069fef: Camera2: Use the triggerAfWithAuto quirk
* commit 'e5f4024bad9875e96cefbe3fe81172d166d52154':
Camera2: Use the triggerAfWithAuto quirk
Diffstat (limited to 'services/camera/libcameraservice/camera2/Parameters.cpp')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 687d7cf..b623d1a 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -607,6 +607,7 @@ status_t Parameters::initialize(const CameraMetadata *info) { params.set(CameraParameters::KEY_SUPPORTED_FOCUS_MODES, supportedFocusModes); } + shadowFocusMode = FOCUS_MODE_INVALID; camera_metadata_ro_entry_t max3aRegions = staticInfo(ANDROID_CONTROL_MAX_REGIONS, 1, 1); @@ -1363,6 +1364,8 @@ status_t Parameters::set(const String8& paramString) { } } } + // Always reset shadow focus mode to avoid reverting settings + shadowFocusMode = FOCUS_MODE_INVALID; // Update in case of override newParams.set(CameraParameters::KEY_FOCUS_MODE, focusModeEnumToString(validatedParams.focusMode)); |