From 5154e14b3e682eb0ad313d060ae12f95357f3a07 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 10 Mar 2021 14:00:50 +0100 Subject: android: camera_device: Do not default External to Front Now that the camera location is not defaulted anymore in the library but doesn't get registered if the firmware interface does not provide the information, do not default it to FRONT if LocationExternal is reported. To maintain compatibility with CTS requirements, default location to FRONT only if the camera property is not available. Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- src/android/camera_device.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index a81e3c90..72a89258 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -376,13 +376,15 @@ int CameraDevice::initialize() facing_ = CAMERA_FACING_BACK; break; case properties::CameraLocationExternal: - /* - * \todo Set this to EXTERNAL once we support - * HARDWARE_LEVEL_EXTERNAL - */ - facing_ = CAMERA_FACING_FRONT; + facing_ = CAMERA_FACING_EXTERNAL; break; } + } else { + /* + * \todo Retrieve the camera location from configuration file + * if not available from the library. + */ + facing_ = CAMERA_FACING_FRONT; } /* -- cgit v1.2.1