commit cc76ec941661206e3a3c53f9aff789c839a869bb
author Igor Murashkin <iam@google.com> Thu Mar 21 11:19:00 2013 -0700
committer Igor Murashkin <iam@google.com> Thu Mar 21 11:32:17 2013 -0700
tree dfd8560b0637afce709759b5e1512f5c6e5da55e
parent caf3a9c1447f602c658f558025b90413d1b4114d

Camera2: getSceneMode should return NULL when there are no supported scene modes

Bug: 8444806
Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 859e2e9..d13fe8b 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -534,6 +534,8 @@
         if (!noSceneModes) {
             params.set(CameraParameters::KEY_SUPPORTED_SCENE_MODES,
                     supportedSceneModes);
+        } else {
+            params.remove(CameraParameters::KEY_SCENE_MODE);
         }
     }