diff options
| author | Brian Duddie <bduddie@google.com> | 2019-06-06 16:43:41 -0700 |
|---|---|---|
| committer | Arjun Garg <arjgarg@google.com> | 2019-07-11 12:17:11 -0700 |
| commit | f2efa0e984618246ce796f36bf3e946e033510f2 (patch) | |
| tree | 368b1c88adf380cb28d4df0b21326e1e5dd83859 | |
| parent | 9741d3d817f3c8a0ef237b3984394a09477c7d50 (diff) | |
| download | native-f2efa0e984618246ce796f36bf3e946e033510f2.tar.gz | |
Fix race between SensorManager ctor and callbackandroid-8.0.0_r41android-8.0.0_r40android-8.0.0_r39android-8.0.0_r38
Avoids potential invalid memory access if system server crashes during
initialization.
Bug: 132927376
Test: confirm sensors initialize
Change-Id: If7421c452b5893ab2567323d265503a1ce304482
Merged-In: If7421c452b5893ab2567323d265503a1ce304482
(cherry picked from commit 231a12189b2b820843ebf5d002876a23e0890c09)
| -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(); } |