commit d55cdc890759b9fcae2553621cd9ab171e2004eb
author Brian Duddie <bduddie@google.com> Mon Jul 01 13:56:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 13:56:24 2019 -0700
tree 702f96a984f00a60e3b7f63c93528334faf8b703
parent 347f88a0ca62b5326d4b72f774d20ce33ab18761
parent 4f398669a4731846c40bd028c06e4c6ba5d2bfb6

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

Change-Id: I2a41b1af98dbd0ee7c2743f3fe5198ca351d8ed8

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