commit 8ad8bc58cd610126b69ce07292f72e58caf962fa
author Biswarup Pal <biswarupp@google.com> Thu Feb 08 13:41:44 2024 +0000
committer Biswarup Pal <biswarupp@google.com> Thu Feb 08 14:47:55 2024 +0000
tree d2467f1bebe01d3a22d32acf660db761435563e7
parent d2ea2c040d7c2429f42bf0c740e515949ab02c1c

Allow ANDROID_LENS_FOCAL_LENGTH in virtual camera capture result

... and set only ANDROID_LENS_INFO_AVAILABLE_FOCAL_LENGTHS into
camera characteristics during camera creation.

Test: atest virtual_camera_tests
Fixes: 324385418
Change-Id: I28d0ed636210bee9309fce0eaaa531d99670f26b

services/camera/virtualcamera/VirtualCameraRenderThread.cc

diff --git a/services/camera/virtualcamera/VirtualCameraRenderThread.cc b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
index 3be3e92..cd36c6d 100644
--- a/services/camera/virtualcamera/VirtualCameraRenderThread.cc
+++ b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
@@ -26,6 +26,7 @@
 #include <thread>
 
 #include "GLES/gl.h"
+#include "VirtualCameraDevice.h"
 #include "VirtualCameraSessionContext.h"
 #include "aidl/android/hardware/camera/common/Status.h"
 #include "aidl/android/hardware/camera/device/BufferStatus.h"
@@ -81,6 +82,7 @@
           .setControlAfMode(ANDROID_CONTROL_AF_MODE_AUTO)
           .setControlAwbMode(ANDROID_CONTROL_AWB_MODE_AUTO)
           .setFlashState(ANDROID_FLASH_STATE_UNAVAILABLE)
+          .setFocalLength(VirtualCameraDevice::kFocalLength)
           .setSensorTimestamp(timestamp)
           .build();
   if (metadata == nullptr) {