Merge "Move main function out of namespace" into qt-dev

am: 5927a9b1f1

Change-Id: I154b181595aa1bd08bacf5ea12b18d28143d4d0e

1 files changed, 7 insertions, 6 deletions

diff --git a/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp b/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp
index 9f007e47f2..835a47b023 100644
--- a/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp
+++ b/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp
@@ -566,15 +566,16 @@ TEST_F(PowerStatsHidlTest, StreamEnergyData) {
     thread1.join();
 }
 
+}  // namespace vts
+}  // namespace stats
+}  // namespace power
+}  // namespace android
+
 int main(int argc, char** argv) {
-    ::testing::AddGlobalTestEnvironment(PowerStatsHidlEnv::Instance());
+    ::testing::AddGlobalTestEnvironment(android::power::stats::vts::PowerStatsHidlEnv::Instance());
     ::testing::InitGoogleTest(&argc, argv);
-    PowerStatsHidlEnv::Instance()->init(&argc, argv);
+    android::power::stats::vts::PowerStatsHidlEnv::Instance()->init(&argc, argv);
     int status = RUN_ALL_TESTS();
     LOG(INFO) << "Test result = " << status;
     return status;
 }
-}  // namespace vts
-}  // namespace stats
-}  // namespace power
-}  // namespace android