diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-08-16 16:03:59 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-08-16 17:11:01 -0700 |
| commit | 3cc89794d92b833feff15ca76dfa196cc886e43f (patch) | |
| tree | d9b54775638b0b4c6aec370485c9bc7f62e14244 /services | |
| parent | ce088d274b4530fb813a030216d675b0e7262711 (diff) | |
| download | frameworks_av-3cc89794d92b833feff15ca76dfa196cc886e43f.zip frameworks_av-3cc89794d92b833feff15ca76dfa196cc886e43f.tar.gz frameworks_av-3cc89794d92b833feff15ca76dfa196cc886e43f.tar.bz2 | |
Camera2: Fix SCENE_MODE
Now can set scene mode back to auto.
Bug: 7001465
Change-Id: Ia25ba54d13de662bef5bf79957987513a7313c18
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 08a54c5..92f4f09 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -1302,7 +1302,8 @@ status_t Camera2Client::setParameters(const String8& params) { // SCENE_MODE int sceneMode = sceneModeStringToEnum( newParams.get(CameraParameters::KEY_SCENE_MODE) ); - if (sceneMode != k.mParameters.sceneMode) { + if (sceneMode != k.mParameters.sceneMode && + sceneMode != ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED) { camera_metadata_entry_t availableSceneModes = staticInfo(ANDROID_CONTROL_AVAILABLE_SCENE_MODES); for (i = 0; i < availableSceneModes.count; i++) { |