From 7eb57b60ab1825afbec3da3786678f548dc58e32 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Mon, 15 May 2017 12:31:25 -0700 Subject: [PATCH] Remove unused lambda capture New clang compiler gives warning to unused lambda captures. Apply clang-format. Bug: 37423073 Test: Build Change-Id: Icdf019df1a6c9dcadeb35551377d7afa09eebb3e --- .../2.0/vts/functional/AudioPrimaryHidlHalTest.cpp | 6 ++-- .../VtsHalCameraProviderV2_4TargetTest.cpp | 39 ++++++++++------------ .../audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp | 2 +- .../video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp | 2 +- .../vts/functional/VtsHalSensorsV1_0TargetTest.cpp | 4 +-- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp index 83a1db04..65b5cfef 100644 --- a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp +++ b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp @@ -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) { diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index c8e44d3d..7a29d425 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -2217,11 +2217,11 @@ TEST_F(CameraHidlTest, configureStreamsZSLInputOutputs) { inputStream, zslStream, outputStream}; StreamConfiguration config = {streams, StreamConfigurationMode::NORMAL_MODE}; - ret = session->configureStreams(config, [streamId] (Status s, - HalStreamConfiguration halConfig) { - ASSERT_EQ(Status::OK, s); - ASSERT_EQ(3u, halConfig.streams.size()); - }); + ret = session->configureStreams(config, + [](Status s, HalStreamConfiguration halConfig) { + ASSERT_EQ(Status::OK, s); + ASSERT_EQ(3u, halConfig.streams.size()); + }); ASSERT_TRUE(ret.isOk()); } } @@ -2280,11 +2280,11 @@ TEST_F(CameraHidlTest, configureStreamsPreviewStillOutputs) { previewStream, blobStream}; StreamConfiguration config = {streams, StreamConfigurationMode::NORMAL_MODE}; - ret = session->configureStreams(config, [streamId] (Status s, - HalStreamConfiguration halConfig) { - ASSERT_EQ(Status::OK, s); - ASSERT_EQ(2u, halConfig.streams.size()); - }); + ret = session->configureStreams(config, + [](Status s, HalStreamConfiguration halConfig) { + ASSERT_EQ(Status::OK, s); + ASSERT_EQ(2u, halConfig.streams.size()); + }); ASSERT_TRUE(ret.isOk()); } } @@ -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,11 +2435,11 @@ TEST_F(CameraHidlTest, configureStreamsVideoStillOutputs) { videoStream, blobStream}; StreamConfiguration config = {streams, StreamConfigurationMode::NORMAL_MODE}; - ret = session->configureStreams(config, [streamId] (Status s, - HalStreamConfiguration halConfig) { - ASSERT_EQ(Status::OK, s); - ASSERT_EQ(2u, halConfig.streams.size()); - }); + ret = session->configureStreams(config, + [](Status s, HalStreamConfiguration halConfig) { + ASSERT_EQ(Status::OK, s); + ASSERT_EQ(2u, halConfig.streams.size()); + }); ASSERT_TRUE(ret.isOk()); } } diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp index 131e2e1b..4a5d25a5 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp @@ -134,7 +134,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { omx = ::testing::VtsHalHidlTargetTestBase::getService( 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); ASSERT_EQ(strncmp(gEnv->getComponent().c_str(), "OMX.", 4), 0) << "Invalid Component Name"; diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp index 72893b88..64296417 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp @@ -134,7 +134,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { omx = ::testing::VtsHalHidlTargetTestBase::getService( 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); ASSERT_EQ(strncmp(gEnv->getComponent().c_str(), "OMX.", 4), 0) << "Invalid Component Name"; diff --git a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp index 06a9d7e8..c92603b6 100644 --- a/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp +++ b/sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp @@ -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); } -- 2.11.0