Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8051ff71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Correct request settings R&C override" into tm-dev am: e279de94 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17872378



Change-Id: I8f20e8396a5c3b6351463efbc51b1146deba0556
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cd8f208 e279de94

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;