commit 37e1a5dcfd4bf4ca1805330f91cec2d3246d4155
author Emilian Peev <epeev@google.com> Thu Jan 18 20:00:00 2018 +0000
committer Emilian Peev <epeev@google.com> Sat Jan 20 15:47:31 2018 +0000
tree 50bf2770d3cf62c40be63781a3611a043921d31b
parent e541981ac2998973e9e365e7c4d339c8c3dd9265

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

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index d44a54a..1bc9e7f 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 @@
     ::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);