| commit | 11a4f0ba3c6acd5dceabafb830040e010a4adb8d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 20 23:39:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 20 23:39:14 2022 +0000 |
| tree | 8c142fa2fa09d441fc5d4bf7875de3ed6bf78a75 | |
| parent | 65349b0cf800c39ede534fe1cf7dc1ddc5abc2a3 [diff] | |
| parent | db7377d00a4fe1cada04ac44b83aabe1e3f60f51 [diff] |
Merge "Camera: Correct request settings R&C override" into tm-dev am: e279de9421 am: db7377d00a Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17872378 Change-Id: I0010435630611fc01a7db6b369da16e0da19bd69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;