diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-04-20 22:48:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-20 22:48:58 +0000 |
| commit | e279de94212268d96ebe2e2bfe1188e6c849c1d0 (patch) | |
| tree | 8c142fa2fa09d441fc5d4bf7875de3ed6bf78a75 /camera | |
| parent | b50f9aa1a93acd01b4c7eb59d4b9f5afff621ef4 (diff) | |
| parent | 3d919f9f6cd2a5addf67542173a77032dbecb3fd (diff) | |
Merge "Camera: Correct request settings R&C override" into tm-dev
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp | 2 |
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; |