summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:40 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:40 +0000
commit648bed82731785ae0763e66d0bcb6d0b7717f10a (patch)
treef64b6c5e1ed993f3abc6385bae926b65d62c351a
parent40d0133f6d3d79600968781ab766dbd520336f3d (diff)
parent2cd1ad424eb5bcda29e3169bf81fc59e9113d650 (diff)
downloadnative-648bed82731785ae0763e66d0bcb6d0b7717f10a.tar.gz
[automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e
Change-Id: Ib67db083237bef98dc44674483340f5b95a8e4eb
-rw-r--r--libs/gui/SensorManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp
index 9fcf9ab2e3..f49dd6e703 100644
--- a/libs/gui/SensorManager.cpp
+++ b/libs/gui/SensorManager.cpp
@@ -90,7 +90,7 @@ SensorManager& SensorManager::getInstanceForPackage(const String16& packageName)
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();
}