summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:36 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:36 +0000
commitc88995f5d839c079ae2a9d88af81c9ed407068f6 (patch)
tree109eb5fd5ea3a23d448974af31736c24983a5f30
parentc0394a666276803b6d047f49e524ec97eaf5c7d5 (diff)
parent4b23ed10ae94ff9e991cc6c1d0946b55733e8f89 (diff)
downloadnative-c88995f5d839c079ae2a9d88af81c9ed407068f6.tar.gz
[automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae
Change-Id: I6ffcf79d2a61f35ac859b6702ee3582375f0c83b
-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 225bfa885f..2e245bfa6c 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();
}