From 7b20bd7733c09ad801bf700b0012e78076e02977 Mon Sep 17 00:00:00 2001 From: Hunter Knepshield Date: Wed, 22 Jan 2020 18:25:14 -0800 Subject: [PATCH] Minor style fixes for IDumpstateDevice@1.1 VTS test Test: make && atest VtsHalDumpstateV1_1TargetTest on cuttlefish Change-Id: I96401270106b856cdde687c0f30c7b940d996cee --- .../1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dumpstate/1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp b/dumpstate/1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp index 3b6051cb7b..583efbf722 100644 --- a/dumpstate/1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp +++ b/dumpstate/1.1/vts/functional/VtsHalDumpstateV1_1TargetTest.cpp @@ -18,6 +18,7 @@ #include #include + #include #include @@ -28,6 +29,8 @@ #include #include +namespace { + using ::android::sp; using ::android::hardware::Return; using ::android::hardware::dumpstate::V1_1::DumpstateMode; @@ -55,7 +58,7 @@ class DumpstateHidl1_1Test : public ::testing::TestWithParam { TEST_FOR_DUMPSTATE_MODE(name, body, WIFI); \ TEST_FOR_DUMPSTATE_MODE(name, body, DEFAULT); -const uint64_t kDefaultTimeoutMillis = 30 * 1000; // 30 seconds +constexpr uint64_t kDefaultTimeoutMillis = 30 * 1000; // 30 seconds // Negative test: make sure dumpstateBoard() doesn't crash when passed a null pointer. TEST_FOR_ALL_DUMPSTATE_MODES(TestNullHandle, [this](DumpstateMode mode) { @@ -169,3 +172,5 @@ INSTANTIATE_TEST_SUITE_P( PerInstance, DumpstateHidl1_1Test, testing::ValuesIn(android::hardware::getAllHalInstanceNames(IDumpstateDevice::descriptor)), android::hardware::PrintInstanceNameToString); + +} // namespace