commit ebb71b593bc72ef63e516c91dc878d54a3ff9eff
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 18 22:25:16 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 18 22:25:16 2019 +0000
tree 6696482bfe7159b76aeec3c15e9dbcadab401a62
parent a3d5ee35e40ca12d412306d8042466005be7e2a4
parent 53f2200ea463d90ddc678b3a7855b3014ad1923c

Merge "Verify mPollThread is joinable before detaching" into android10-tests-dev

sensors/common/vts/utils/SensorsHidlEnvironmentBase.cpp

diff --git a/sensors/common/vts/utils/SensorsHidlEnvironmentBase.cpp b/sensors/common/vts/utils/SensorsHidlEnvironmentBase.cpp
index affdf8b..fa0e2e9 100644
--- a/sensors/common/vts/utils/SensorsHidlEnvironmentBase.cpp
+++ b/sensors/common/vts/utils/SensorsHidlEnvironmentBase.cpp
@@ -29,7 +29,9 @@
 
 void SensorsHidlEnvironmentBase::HidlTearDown() {
     mStopThread = true;
-    mPollThread.detach();
+    if (mPollThread.joinable()) {
+        mPollThread.detach();
+    }
 }
 
 void SensorsHidlEnvironmentBase::catEvents(std::vector<Event>* output) {