commit d0a102577864a3ef07034b14075a526d79cf12cc
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jul 01 20:58:42 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jul 01 20:58:42 2019 +0000
tree b64e7064a687b5672e9c5577e25ddd47dfc03d31
parent 5ab710e47686c6cda7e65e67011353f6752311ca
parent 648bed82731785ae0763e66d0bcb6d0b7717f10a

[automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e am: 648bed8273

Change-Id: I2daed7ee8ab62787f4dda1f0fdc629356a8bf9ea

libs/gui/SensorManager.cpp

diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp
index 9fcf9ab..f49dd6e 100644
--- a/libs/gui/SensorManager.cpp
+++ b/libs/gui/SensorManager.cpp
@@ -90,7 +90,7 @@
 
 SensorManager::SensorManager(const String16& opPackageName)
     : mSensorList(0), mOpPackageName(opPackageName) {
-    // okay we're not locked here, but it's not needed during construction
+    Mutex::Autolock _l(mLock);
     assertStateLocked();
 }