From 37e1a5dcfd4bf4ca1805330f91cec2d3246d4155 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Thu, 18 Jan 2018 20:00:00 +0000 Subject: [PATCH] Camera: Include session parameters for 3.4 devices To avoid glitches and unexpected behavior, session parameters should be included in the stream configuration before invoking capture requests. Bug: 70560715 Test: run vts --skip-all-system-status-check --skip-preconditions --primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO Change-Id: Id4ecd40533157f1a3299099a984ffab21654548a --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index d44a54acb5..1bc9e7f1d4 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -3833,6 +3833,13 @@ void CameraHidlTest::configurePreviewStream(const std::string &name, int32_t dev ::android::hardware::camera::device::V3_4::StreamConfiguration config; config.v3_2 = {streams, StreamConfigurationMode::NORMAL_MODE}; if (session3_4 != nullptr) { + RequestTemplate reqTemplate = RequestTemplate::PREVIEW; + ret = session3_4->constructDefaultRequestSettings(reqTemplate, + [&config](auto status, const auto& req) { + ASSERT_EQ(Status::OK, status); + config.sessionParams = req; + }); + ASSERT_TRUE(ret.isOk()); ret = session3_4->configureStreams_3_4(config, [&] (Status s, device::V3_3::HalStreamConfiguration halConfig) { ASSERT_EQ(Status::OK, s);