commit 4158f80438f1e4a9c3eb2b58e55be4770d8f0be7
author Brian Duddie <bduddie@google.com> Mon Jul 01 19:19:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 19:19:07 2019 -0700
tree 7187d667ce6ecc9fdafdc3c504ff3f69e7e72424
parent 5b788aa514935cc3785e93669bbd96cb347d5f08
parent ade39600c57a35552d6dc035ed2a2ce974ca99ac

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

Change-Id: I027ea10e13f9cabad72fe96739a8e25fe0b69881

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index b9ae524..c97e4da 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -94,7 +94,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();
 }