commit 0e70902d344a8127c0b4d5c315c5aa1572b22ea0
author Brian Duddie <bduddie@google.com> Tue Jun 11 14:08:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 11 14:08:02 2019 -0700
tree 8c8caf0884f5c7438c8f48c937a83d91af373e22
parent 531e25de7e3f77e38ad9747e1215cbda61a9991a
parent b6b28e58c421c12ca70c71d2f396e9ce11e2e5df

Fix null deref in sensors 2.0 VTS teardown
am: b6b28e58c4

Change-Id: I98288c2bea54fdbb7e733913ccba839817b7217a

sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp

diff --git a/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp b/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
index be7415b..5f71654 100644
--- a/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
+++ b/sensors/2.0/vts/functional/SensorsHidlEnvironmentV2_0.cpp
@@ -109,11 +109,15 @@
 void SensorsHidlEnvironmentV2_0::HidlTearDown() {
     mStopThread = true;
 
-    // Wake up the event queue so the poll thread can exit
-    mEventQueueFlag->wake(asBaseType(EventQueueFlagBits::READ_AND_PROCESS));
-    mPollThread.join();
+    if (mEventQueueFlag != nullptr) {
+        // Wake up the event queue so the poll thread can exit
+        mEventQueueFlag->wake(asBaseType(EventQueueFlagBits::READ_AND_PROCESS));
+        if (mPollThread.joinable()) {
+            mPollThread.join();
+        }
 
-    EventFlag::deleteEventFlag(&mEventQueueFlag);
+        EventFlag::deleteEventFlag(&mEventQueueFlag);
+    }
 }
 
 void SensorsHidlEnvironmentV2_0::startPollingThread() {