diff options
| author | Brian Duddie <bduddie@google.com> | 2019-06-06 16:43:41 -0700 |
|---|---|---|
| committer | Brian Duddie <bduddie@google.com> | 2019-07-01 20:57:36 +0000 |
| commit | 231a12189b2b820843ebf5d002876a23e0890c09 (patch) | |
| tree | e2a8289ffb75cd0b791efcc93b9f84913364de43 | |
| parent | c1aa15f04d3aa38d41f73a280df627e317ce0cb3 (diff) | |
| download | native-231a12189b2b820843ebf5d002876a23e0890c09.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/sensor/SensorManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp index 3fbc5ebba8..1ab9489f56 100644 --- a/libs/sensor/SensorManager.cpp +++ b/libs/sensor/SensorManager.cpp @@ -93,7 +93,7 @@ SensorManager& SensorManager::getInstanceForPackage(const String16& packageName) SensorManager::SensorManager(const String16& opPackageName) : mSensorList(0), mOpPackageName(opPackageName), mDirectConnectionHandle(1) { - // okay we're not locked here, but it's not needed during construction + Mutex::Autolock _l(mLock); assertStateLocked(); } |