commit c9f801bbd4911d73b51a3f4d67fe063d2e1292a1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jun 01 00:14:32 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 01 00:14:32 2024 +0000
tree 2a5c1777f74de2ac7600ef85f600a9fbe3ee0200
parent 3ddd4246d9fd0be74727711163f9b59e1ebd6ae7
parent 2c3b63f04f5972b4c52929ef63ffa1a5a4672e65

Merge "VTSHalPowerTarget: Add condition check for FMQAidl teardown" into aosp-main-future

power/aidl/vts/VtsHalPowerTargetTest.cpp

diff --git a/power/aidl/vts/VtsHalPowerTargetTest.cpp b/power/aidl/vts/VtsHalPowerTargetTest.cpp
index 53fcef1..db777c5 100644
--- a/power/aidl/vts/VtsHalPowerTargetTest.cpp
+++ b/power/aidl/vts/VtsHalPowerTargetTest.cpp
@@ -175,8 +175,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: