[libcamera-devel] [PATCH v2 3/3] android: camera_device: Do not default External to Front

[Jacopo Mondi]

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: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
 src/android/camera_device.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index a81e3c905d6c..72a89258386d 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;
 	}
 
 	/*
-- 
2.30.0