commit edfd5ce150cf77992dd3cf7804f132f956791c8e
author Brian Duddie <bduddie@google.com> Tue Jun 11 14:14:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 11 14:14:33 2019 -0700
tree 8c8caf0884f5c7438c8f48c937a83d91af373e22
parent 99491c82550f61245894739cda5f395e5a71a503
parent 6e4370b5b6270f7c0faa976bc8c82f6aa02619be

Fix null deref in sensors 2.0 VTS teardown am: b6b28e58c4
am: 6e4370b5b6

Change-Id: Ia83ca44811b5cda68152cee2c989a533e3e43e75

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() {