commit 0db905b275b6fd92cfab3cb4347116f8b67481a7
author Brian Duddie <bduddie@google.com> Mon Jul 01 14:17:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 14:17:29 2019 -0700
tree cc70f7dfc2dbb1c6b9c85a06eb77c6314d229874
parent 466748f4157109fe5e093ba15383f1b8b7642d0e
parent 36efda184a740bb10008717df76ec4c0760e6f87

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

Change-Id: I68b75254aec4f9b69b69b49209686a1682373c66

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