commit 36efda184a740bb10008717df76ec4c0760e6f87
author Brian Duddie <bduddie@google.com> Mon Jul 01 14:09:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 14:09:37 2019 -0700
tree ec68769f5e3e1547eb208e500594005b5221ad97
parent 5df67ba3f8f2e88fd988f162136356f3446fa00f
parent d55cdc890759b9fcae2553621cd9ab171e2004eb

Merge "Fix race between SensorManager ctor and callback" into qt-dev am: 4f398669a4
am: d55cdc8907

Change-Id: I2c3a338cd8419b3e7c89939f89bd6b6acec52b2a

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index 5840d51..96d5eb9 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -94,7 +94,7 @@
 
 SensorManager::SensorManager(const String16& opPackageName)
     : mSensorList(nullptr), mOpPackageName(opPackageName), mDirectConnectionHandle(1) {
-    // okay we're not locked here, but it's not needed during construction
+    Mutex::Autolock _l(mLock);
     assertStateLocked();
 }