commit 91768a2bfe0bea433a93a4c98151eec011329414
author Peng Xu <pengxu@google.com> Wed Jun 14 06:20:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 14 06:20:52 2017 +0000
tree 54b178af66fcb57fc847a0f2432c57cbd273cc41
parent fc045b9de40eb3701438df6be2275abba619ce14
parent 638055ef41f6d248290c8867dd85c8a4690fa584

Merge changes from topic 'sensor_looper_crash' into oc-dev
am: 638055ef41

Change-Id: I774229e9c84e7b390861638e478e2330b66c3d57

services/sensorservice/hidl/SensorManager.cpp

diff --git a/services/sensorservice/hidl/SensorManager.cpp b/services/sensorservice/hidl/SensorManager.cpp
index 004a5c5..25a3dc5 100644
--- a/services/sensorservice/hidl/SensorManager.cpp
+++ b/services/sensorservice/hidl/SensorManager.cpp
@@ -143,6 +143,10 @@
             }
 
             std::unique_lock<std::mutex> lock(mutex);
+            if (looper != nullptr) {
+                LOG(INFO) << "Another thread has already set the looper, exiting this one.";
+                return;
+            }
             looper = Looper::prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS /* opts */);
             lock.unlock();