commit d3753ec91db5416f939e633e5020f50ced84c0e9
author jimmyshiu <jimmyshiu@google.com> Tue Mar 19 08:56:42 2024 +0000
committer jimmyshiu <jimmyshiu@google.com> Tue Mar 19 09:05:14 2024 +0000
tree ddf866418626fc50199b96f2a9ec427d139a8db9
parent c26e3123f31336d714ec56d4561cf38ef91b94dd

VTSHalPowerTarget: Add condition check for FMQAidl teardown

While FMQAidl Setup() was skipped, some uninitialized objects would be
used in FMQAidl Teardown() which caused the test failed.
Add some condition check to prevent from using uninitialized objects.

Test: atest VTSHalPowerTarget
Bug: 328330332
Change-Id: I83081cbef66da1d74d87e191f266cb16fb559b85

power/aidl/vts/VtsHalPowerTargetTest.cpp

diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp
index 67efa7a..939deb2 100644
--- a/power/aidl/vts/VtsHalPowerTargetTest.cpp
+++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp
@@ -180,8 +180,12 @@
         ASSERT_NE(mEventFlag, nullptr);
     }
     virtual void TearDown() {
-        mSession->close();
-        ASSERT_TRUE(power->closeSessionChannel(getpid(), getuid()).isOk());
+        if (mSession) {
+            mSession->close();
+            if (mChannel->isValid()) {
+                ASSERT_TRUE(power->closeSessionChannel(getpid(), getuid()).isOk());
+            }
+        }
     }
 
   protected: