summaryrefslogtreecommitdiff
path: root/camera
diff options
context:
space:
mode:
authorEmilian Peev <epeev@google.com>2022-04-20 13:50:59 -0700
committerEmilian Peev <epeev@google.com>2022-04-20 13:53:00 -0700
commit3d919f9f6cd2a5addf67542173a77032dbecb3fd (patch)
treead262ffc6619c0d165f3cdef4e2daa536be754fb /camera
parent5d66c5fad1b5491a2d85356466d0d1e97d6ac2f4 (diff)
Camera: Correct request settings R&C override
Assign the R&C overriden 'settingsMetadata' in the capture request. Bug: 222648486 Test: adb shell VtsAidlHalCameraProvider_TargetTest --gtest_filter=PerInstance/CameraAidlTest.processMultiCaptureRequestPreview/0_android_hardware_camera_provider_ICameraProvider_internal_0 Change-Id: I5825ebae59e8d3c05e5c301825b0ab8e6c1f50dc
Diffstat (limited to 'camera')
-rw-r--r--camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
index bde56b315c..462698c87a 100644
--- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
+++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
@@ -1554,7 +1554,7 @@ TEST_P(CameraAidlTest, processMultiCaptureRequestPreview) {
CaptureRequest& request = requests[0];
request.frameNumber = frameNumber;
request.fmqSettingsSize = 0;
- request.settings.metadata = settings;
+ request.settings = settingsMetadata;
std::vector<StreamBuffer>& outputBuffers = request.outputBuffers;