summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:38 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-01 20:58:38 +0000
commit2cd1ad424eb5bcda29e3169bf81fc59e9113d650 (patch)
tree4e6317563752c754f9899864862bfee177157350
parentfbdb526a6ab454a66ececf7a5d4827e6dc74dc2b (diff)
parentc88995f5d839c079ae2a9d88af81c9ed407068f6 (diff)
downloadnative-2cd1ad424eb5bcda29e3169bf81fc59e9113d650.tar.gz
[automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8
Change-Id: Ifd8e06c0a18b17df30295017d86bb7fcb2ffef94
-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();
}