summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorUmang Jain <umang.jain@ideasonboard.com>2021-07-30 16:31:52 +0530
committerUmang Jain <umang.jain@ideasonboard.com>2021-08-04 09:03:29 +0530
commitf65fad5a4d5566f37eab67bbb95daa9235d61978 (patch)
tree6f7a12f71b133c497ebb075dea45158ccfd871b2 /src/android
parentcc0a50cddf8a45cc1402b0739275bf619e9c46d3 (diff)
android: Disallow external location in HAL config
Error out on any camera's location if set to "external", in the HAL configuration file. The HAL configuration file is meant to override the location property, and overriding an internal camera location to external doesn't make sense. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_hal_config.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index bbbb1410..14549083 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -126,8 +126,6 @@ int CameraHalConfig::Private::parseCameraLocation(CameraConfigData *cameraConfig
cameraConfigData->facing = CAMERA_FACING_FRONT;
else if (location == "back")
cameraConfigData->facing = CAMERA_FACING_BACK;
- else if (location == "external")
- cameraConfigData->facing = CAMERA_FACING_EXTERNAL;
else
return -EINVAL;