commit 97d3c3b991d0b03f6572c97c823cb759d5fcfaf0
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 22 20:26:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 22 20:26:32 2018 +0000
tree 4039bb884f4c8257eaa316cb59495b4afd225c5d
parent af4d761cf50936c4f52f7b488b6fa3339e8e3156
parent 37e1a5dcfd4bf4ca1805330f91cec2d3246d4155

Merge "Camera: Include session parameters for 3.4 devices"

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);