| commit | e279de94212268d96ebe2e2bfe1188e6c849c1d0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 20 22:48:58 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 20 22:48:58 2022 +0000 |
| tree | 8c142fa2fa09d441fc5d4bf7875de3ed6bf78a75 | |
| parent | b50f9aa1a93acd01b4c7eb59d4b9f5afff621ef4 [diff] | |
| parent | 3d919f9f6cd2a5addf67542173a77032dbecb3fd [diff] |
Merge "Camera: Correct request settings R&C override" into tm-dev
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;