Merge "Remove unused lambda capture" (8973d8f6) · Commits · e / os / android_hardware_interfaces

audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -557,8 +557,7 @@ static void testDebugDump(DebugDump debugDump) {

		TEST_F(AudioPrimaryHidlTest, DebugDump) {
		doc::test("Check that the hal can dump its state without error");
		testDebugDump(
		[this](const auto& handle) { return device->debugDump(handle); });
		testDebugDump([](const auto& handle) { return device->debugDump(handle); });
		}

		TEST_F(AudioPrimaryHidlTest, DebugDumpInvalidArguments) {
		@@ -1353,8 +1352,7 @@ TEST_P(OutputStreamTest, GetPresentationPositionStop) {

		TEST_F(AudioPrimaryHidlTest, setVoiceVolume) {
		doc::test("Make sure setVoiceVolume only succeed if volume is in [0,1]");
		testUnitaryGain(
		[this](float volume) { return device->setVoiceVolume(volume); });
		testUnitaryGain([](float volume) { return device->setVoiceVolume(volume); });
		}

		TEST_F(AudioPrimaryHidlTest, setMode) {

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

+18 −21

Original line number	Diff line number	Diff line
		@@ -2217,8 +2217,8 @@ TEST_F(CameraHidlTest, configureStreamsZSLInputOutputs) {
		inputStream, zslStream, outputStream};
		StreamConfiguration config = {streams,
		StreamConfigurationMode::NORMAL_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration halConfig) {
		ret = session->configureStreams(config,
		[](Status s, HalStreamConfiguration halConfig) {
		ASSERT_EQ(Status::OK, s);
		ASSERT_EQ(3u, halConfig.streams.size());
		});
		@@ -2280,8 +2280,8 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) {
		previewStream, blobStream};
		StreamConfiguration config = {streams,
		StreamConfigurationMode::NORMAL_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration halConfig) {
		ret = session->configureStreams(config,
		[](Status s, HalStreamConfiguration halConfig) {
		ASSERT_EQ(Status::OK, s);
		ASSERT_EQ(2u, halConfig.streams.size());
		});
		@@ -2348,8 +2348,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
		streams[0] = stream;
		config = {streams,
		StreamConfigurationMode::CONSTRAINED_HIGH_SPEED_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration) {
		ret = session->configureStreams(config, [](Status s, HalStreamConfiguration) {
		ASSERT_TRUE((Status::ILLEGAL_ARGUMENT == s) \|\|
		(Status::INTERNAL_ERROR == s));
		});
		@@ -2363,8 +2362,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
		streams[0] = stream;
		config = {streams,
		StreamConfigurationMode::CONSTRAINED_HIGH_SPEED_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration) {
		ret = session->configureStreams(config, [](Status s, HalStreamConfiguration) {
		ASSERT_EQ(Status::ILLEGAL_ARGUMENT, s);
		});
		ASSERT_TRUE(ret.isOk());
		@@ -2377,8 +2375,7 @@ TEST_F(CameraHidlTest, configureStreamsConstrainedOutputs) {
		streams[0] = stream;
		config = {streams,
		StreamConfigurationMode::CONSTRAINED_HIGH_SPEED_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration) {
		ret = session->configureStreams(config, [](Status s, HalStreamConfiguration) {
		ASSERT_EQ(Status::ILLEGAL_ARGUMENT, s);
		});
		ASSERT_TRUE(ret.isOk());
		@@ -2438,8 +2435,8 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) {
		videoStream, blobStream};
		StreamConfiguration config = {streams,
		StreamConfigurationMode::NORMAL_MODE};
		ret = session->configureStreams(config, [streamId] (Status s,
		HalStreamConfiguration halConfig) {
		ret = session->configureStreams(config,
		[](Status s, HalStreamConfiguration halConfig) {
		ASSERT_EQ(Status::OK, s);
		ASSERT_EQ(2u, halConfig.streams.size());
		});

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer = new CodecObserver([this](Message msg) { (void)msg; });
		observer = new CodecObserver([](Message msg) { (void)msg; });
		ASSERT_NE(observer, nullptr);
		if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0)
		disableTest = true;

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer = new CodecObserver([this](Message msg) { (void)msg; });
		observer = new CodecObserver([](Message msg) { (void)msg; });
		ASSERT_NE(observer, nullptr);
		if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0)
		disableTest = true;

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -1319,9 +1319,7 @@ void SensorsHidlTest::testDirectReportOperation(

		// stop sensor and unregister channel
		configDirectReport(sensor.sensorHandle, channelHandle, RateLevel::STOP,
		[&eventToken] (auto result, auto) {
		EXPECT_EQ(result, Result::OK);
		});
		[](auto result, auto) { EXPECT_EQ(result, Result::OK); });
		EXPECT_EQ(unregisterDirectChannel(channelHandle), Result::OK);
		}