commit ade39600c57a35552d6dc035ed2a2ce974ca99ac
author Brian Duddie <bduddie@google.com> Mon Jul 01 19:01:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 19:01:17 2019 -0700
tree 5e4c31470bb668b12d417de717c56445fb41683c
parent f658b2d8b3d83e82dcb32f5cffdbc9ccbb46f8fc
parent 4245ab3a0fc16b230b5b83acc79aedd02247cb01

Fix race between SensorManager ctor and callback am: 231a12189b
am: 4245ab3a0f

Change-Id: I41b42796fb21641af2f8bc14733212f189520995

libs/sensor/SensorManager.cpp

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