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

This commit is contained in:
Treehugger Robot
2024-06-01 00:14:32 +00:00
committed by Android (Google) Code Review

View File

@@ -175,8 +175,12 @@ class FMQAidl : public PowerAidl {
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: