commit 9196033db8caaf8723886e3bbe865aa2ed27e9da
author Brian Duddie <bduddie@google.com> Mon Jul 01 13:57:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 13:57:24 2019 -0700
tree dca53e74531ba0efbf6be099c0a0d30385c2627e
parent b6a69645eb19d0c10639e243b7a96d88064a9c24
parent 4f398669a4731846c40bd028c06e4c6ba5d2bfb6

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

Change-Id: I8c292e891dcc4d4d65b7d7021a7924311aa26b92

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();
 }