commit 4245ab3a0fc16b230b5b83acc79aedd02247cb01
author Brian Duddie <bduddie@google.com> Mon Jul 01 18:46:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 18:46:03 2019 -0700
tree 1183f2406edcd5b1638468d6b353bb10fee026aa
parent bfb94faeace647e6b61f105d28580148c4b2facd
parent 231a12189b2b820843ebf5d002876a23e0890c09

Fix race between SensorManager ctor and callback
am: 231a12189b

Change-Id: Id272955770700f18cb113c68f807728c4a1f0802

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