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:16:56 -0700 |
| commit | 650536f6d1470a044b417482557806b10c356724 (patch) | |
| tree | d5c6f0e0e51ce624ddf0a1a8c7445a09032a5bcf | |
| parent | d753e9e318cfb190cf550fa7a3d341730ed3e1e6 (diff) | |
| download | native-android-8.1.0_r71.tar.gz | |
Fix race between SensorManager ctor and callbackandroid-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68
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 6fe72a13ba..5fbaf1bf1e 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(); } |