commit 3d919f9f6cd2a5addf67542173a77032dbecb3fd
author Emilian Peev <epeev@google.com> Wed Apr 20 13:50:59 2022 -0700
committer Emilian Peev <epeev@google.com> Wed Apr 20 13:53:00 2022 -0700
tree ad262ffc6619c0d165f3cdef4e2daa536be754fb
parent 5d66c5fad1b5491a2d85356466d0d1e97d6ac2f4

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

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
index bde56b3..462698c 100644
--- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
+++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
@@ -1554,7 +1554,7 @@
         CaptureRequest& request = requests[0];
         request.frameNumber = frameNumber;
         request.fmqSettingsSize = 0;
-        request.settings.metadata = settings;
+        request.settings = settingsMetadata;
 
         std::vector<StreamBuffer>& outputBuffers = request.outputBuffers;