commit 3cc89794d92b833feff15ca76dfa196cc886e43f
author Eino-Ville Talvala <etalvala@google.com> Thu Aug 16 16:03:59 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Thu Aug 16 17:11:01 2012 -0700
tree d9b54775638b0b4c6aec370485c9bc7f62e14244
parent ce088d274b4530fb813a030216d675b0e7262711

Camera2: Fix SCENE_MODE

Now can set scene mode back to auto.

Bug: 7001465

Change-Id: Ia25ba54d13de662bef5bf79957987513a7313c18

services/camera/libcameraservice/Camera2Client.cpp

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 @@
     // 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++) {