commit 4a02cc818607c0c145f91c3acb9181868a108f26
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 10 09:53:09 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Sep 10 09:53:09 2012 -0700
tree 8a50d9cd82ba073a38bb9496f12cec4675cc625d
parent fd48021dfc3278b048ba99ecffe7f996751fb440

Camera2: Sanity check inputs better.

Bug: 7132141
Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index e5942dc..71aa39b 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1553,6 +1553,8 @@
 
 int Parameters::formatStringToEnum(const char *format) {
     return
+        !format ?
+            HAL_PIXEL_FORMAT_YCrCb_420_SP :
         !strcmp(format, CameraParameters::PIXEL_FORMAT_YUV422SP) ?
             HAL_PIXEL_FORMAT_YCbCr_422_SP : // NV16
         !strcmp(format, CameraParameters::PIXEL_FORMAT_YUV420SP) ?
@@ -1606,6 +1608,8 @@
 
 int Parameters::wbModeStringToEnum(const char *wbMode) {
     return
+        !wbMode ?
+            ANDROID_CONTROL_AWB_AUTO :
         !strcmp(wbMode, CameraParameters::WHITE_BALANCE_AUTO) ?
             ANDROID_CONTROL_AWB_AUTO :
         !strcmp(wbMode, CameraParameters::WHITE_BALANCE_INCANDESCENT) ?
@@ -1627,6 +1631,8 @@
 
 int Parameters::effectModeStringToEnum(const char *effectMode) {
     return
+        !effectMode ?
+            ANDROID_CONTROL_EFFECT_OFF :
         !strcmp(effectMode, CameraParameters::EFFECT_NONE) ?
             ANDROID_CONTROL_EFFECT_OFF :
         !strcmp(effectMode, CameraParameters::EFFECT_MONO) ?
@@ -1650,6 +1656,8 @@
 
 int Parameters::abModeStringToEnum(const char *abMode) {
     return
+        !abMode ?
+            ANDROID_CONTROL_AE_ANTIBANDING_AUTO :
         !strcmp(abMode, CameraParameters::ANTIBANDING_AUTO) ?
             ANDROID_CONTROL_AE_ANTIBANDING_AUTO :
         !strcmp(abMode, CameraParameters::ANTIBANDING_OFF) ?
@@ -1663,6 +1671,8 @@
 
 int Parameters::sceneModeStringToEnum(const char *sceneMode) {
     return
+        !sceneMode ?
+            ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED :
         !strcmp(sceneMode, CameraParameters::SCENE_MODE_AUTO) ?
             ANDROID_CONTROL_SCENE_MODE_UNSUPPORTED :
         !strcmp(sceneMode, CameraParameters::SCENE_MODE_ACTION) ?
@@ -1701,6 +1711,8 @@
 Parameters::Parameters::flashMode_t Parameters::flashModeStringToEnum(
         const char *flashMode) {
     return
+        !flashMode ?
+            Parameters::FLASH_MODE_INVALID :
         !strcmp(flashMode, CameraParameters::FLASH_MODE_OFF) ?
             Parameters::FLASH_MODE_OFF :
         !strcmp(flashMode, CameraParameters::FLASH_MODE_AUTO) ?
@@ -1717,6 +1729,8 @@
 Parameters::Parameters::focusMode_t Parameters::focusModeStringToEnum(
         const char *focusMode) {
     return
+        !focusMode ?
+            Parameters::FOCUS_MODE_INVALID :
         !strcmp(focusMode, CameraParameters::FOCUS_MODE_AUTO) ?
             Parameters::FOCUS_MODE_AUTO :
         !strcmp(focusMode, CameraParameters::FOCUS_MODE_INFINITY) ?
@@ -1737,6 +1751,8 @@
 Parameters::Parameters::lightFxMode_t Parameters::lightFxStringToEnum(
         const char *lightFxMode) {
     return
+        !lightFxMode ?
+            Parameters::LIGHTFX_NONE :
         !strcmp(lightFxMode, CameraParameters::LIGHTFX_LOWLIGHT) ?
             Parameters::LIGHTFX_LOWLIGHT :
         !strcmp(lightFxMode, CameraParameters::LIGHTFX_HDR) ?