commit be7e9756eb79f7083ab7e095074a04196c0aa1cc
author jimmyshiu <jimmyshiu@google.com> Tue Mar 19 08:56:42 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Mar 21 23:49:53 2024 +0000
tree 5315bee280a8c0502ceb5a97f9c3808825020c46
parent 92e08f938798808aba70be6c6b7a9ca333ddee95

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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3753ec91db5416f939e633e5020f50ced84c0e9)
Merged-In: I83081cbef66da1d74d87e191f266cb16fb559b85
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: