diff options
author | Erik Staats <estaats@google.com> | 2021-11-03 15:32:49 -0700 |
---|---|---|
committer | Erik Staats <estaats@google.com> | 2021-11-03 15:32:49 -0700 |
commit | 24ead9d84a9d9ef077f4d44995e2add9a79a206d (patch) | |
tree | 94db486a042c231509a1f4b7463b2f56081434e5 | |
parent | 35964ba0768558fe61fd225a51015c1b56656ddc (diff) | |
download | libhardware-24ead9d84a9d9ef077f4d44995e2add9a79a206d.tar.gz |
dynamic_sensor: Don't hold mgr lock when operating sensor.
Bug: 205041452
Test: Verified that multiple subscriptions can be made with sensor_test
to a dynamic sensor without hanging.
Change-Id: Ie7671df8294bee04a0ebe1940242c2a83105f897
-rw-r--r-- | modules/sensors/dynamic_sensor/DynamicSensorManager.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/sensors/dynamic_sensor/DynamicSensorManager.h b/modules/sensors/dynamic_sensor/DynamicSensorManager.h index 634c5234..264582ec 100644 --- a/modules/sensors/dynamic_sensor/DynamicSensorManager.h +++ b/modules/sensors/dynamic_sensor/DynamicSensorManager.h @@ -95,15 +95,18 @@ private: // TF: int foo(sp<BaseSensorObject> obj); template <typename TF> int operateSensor(int handle, TF f) const { - std::lock_guard<std::mutex> lk(mLock); - const auto i = mMap.find(handle); - if (i == mMap.end()) { - return BAD_VALUE; - } - sp<BaseSensorObject> s = i->second.promote(); - if (s == nullptr) { - // sensor object is already gone - return BAD_VALUE; + sp<BaseSensorObject> s; + { + std::lock_guard<std::mutex> lk(mLock); + const auto i = mMap.find(handle); + if (i == mMap.end()) { + return BAD_VALUE; + } + s = i->second.promote(); + if (s == nullptr) { + // sensor object is already gone + return BAD_VALUE; + } } return f(s); } |