From cc76ec941661206e3a3c53f9aff789c839a869bb Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Thu, 21 Mar 2013 11:19:00 -0700
Subject: Camera2: getSceneMode should return NULL when there are no supported
 scene modes

Bug: 8444806
Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546
---
 services/camera/libcameraservice/camera2/Parameters.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'services')

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 @@ status_t Parameters::initialize(const CameraMetadata *info) {
         if (!noSceneModes) {
             params.set(CameraParameters::KEY_SUPPORTED_SCENE_MODES,
                     supportedSceneModes);
+        } else {
+            params.remove(CameraParameters::KEY_SCENE_MODE);
         }
     }
 
-- 
cgit v1.1