Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bc681f authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Yi Kong
Browse files

Remove unused lambda capture

New clang compiler gives warning to unused lambda captures.
Apply clang-format.

Bug: 37423073
Test: Build

Change-Id: Icdf019df1a6c9dcadeb35551377d7afa09eebb3e
(cherry picked from commit 7eb57b60)
parent 176c564b
Loading
Loading
Loading
Loading
+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) {
@@ -1341,8 +1340,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) {
+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());
                                                    });
+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
            gEnv->getInstance());
        ASSERT_NE(omx, nullptr);
        observer =
            new CodecObserver([this](Message msg, const BufferInfo* buffer) {
            new CodecObserver([](Message msg, const BufferInfo* buffer) {
                handleMessage(msg, buffer);
            });
        ASSERT_NE(observer, nullptr);
+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
            gEnv->getInstance());
        ASSERT_NE(omx, nullptr);
        observer =
            new CodecObserver([this](Message msg, const BufferInfo* buffer) {
            new CodecObserver([](Message msg, const BufferInfo* buffer) {
                handleMessage(msg, buffer);
            });
        ASSERT_NE(observer, nullptr);
+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);
}