summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Duddie <bduddie@google.com>2019-06-06 16:43:41 -0700
committerBrian Duddie <bduddie@google.com>2019-07-01 20:58:32 +0000
commit4b23ed10ae94ff9e991cc6c1d0946b55733e8f89 (patch)
treee155ddcf90d148e3c3bd1f7f094171b60e85aa51
parentedd3e3d8f441131b02e5a78d18babf9d16ef9e6e (diff)
downloadnative-4b23ed10ae94ff9e991cc6c1d0946b55733e8f89.tar.gz
Fix race between SensorManager ctor and callback
Avoids potential invalid memory access if system server crashes during initialization. Bug: 132927376 Test: confirm sensors initialize Change-Id: If7421c452b5893ab2567323d265503a1ce304482 Merged-In: If7421c452b5893ab2567323d265503a1ce304482
-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();
}