commit 25cd9d67d5080f5f53cce715f679d923ca85c262
author Yu-Han Yang <yuhany@google.com> Thu Oct 13 23:06:31 2022 +0000
committer Yu-Han Yang <yuhany@google.com> Fri Oct 14 23:14:58 2022 +0000
tree 53b0c3bde753bfaaa8d417b6296fdc4410cdf91e
parent 9604eb65fe2391925aa096b0e0801af7182546ab

Call close() in TearDown()

Bug: 251580081
Test: atest VtsHalGnssTargetTest
Change-Id: Ieb02205f434899f7e9c5db32cfa7172788c39fa6

gnss/aidl/vts/gnss_hal_test.cpp

diff --git a/gnss/aidl/vts/gnss_hal_test.cpp b/gnss/aidl/vts/gnss_hal_test.cpp
index 0e1218e..3907f57 100644
--- a/gnss/aidl/vts/gnss_hal_test.cpp
+++ b/gnss/aidl/vts/gnss_hal_test.cpp
@@ -107,6 +107,17 @@
     }
 }
 
+void GnssHalTest::TearDown() {
+    GnssHalTestTemplate<IGnss_V2_1>::TearDown();
+    if (aidl_gnss_hal_ != nullptr) {
+        aidl_gnss_hal_->close();
+        aidl_gnss_hal_ = nullptr;
+    }
+
+    // Set to nullptr to destruct the callback event queues and warn of any unprocessed events.
+    aidl_gnss_cb_ = nullptr;
+}
+
 void GnssHalTest::CheckLocation(const GnssLocation& location, bool check_speed) {
     Utils::checkLocation(location, check_speed, /* check_more_accuracies= */ true);
 }

gnss/aidl/vts/gnss_hal_test.h

diff --git a/gnss/aidl/vts/gnss_hal_test.h b/gnss/aidl/vts/gnss_hal_test.h
index 645fc82..c49c1b9 100644
--- a/gnss/aidl/vts/gnss_hal_test.h
+++ b/gnss/aidl/vts/gnss_hal_test.h
@@ -64,6 +64,7 @@
 
     virtual void SetUp() override;
     virtual void SetUpGnssCallback() override;
+    virtual void TearDown() override;
 
     void CheckLocation(const android::hardware::gnss::GnssLocation& location,
                        const bool check_speed);