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:08:33 -0700 |
| commit | 230978217f4034aae0a129790a32520b03b7fdc0 (patch) | |
| tree | 4e6317563752c754f9899864862bfee177157350 | |
| parent | 46f91c5b784419efc7bec05afc54484735dd332e (diff) | |
| download | native-nougat-mr1-security-release.tar.gz | |
Fix race between SensorManager ctor and callbackandroid-7.1.1_r61android-7.1.1_r60nougat-mr1-security-release
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 4b23ed10ae94ff9e991cc6c1d0946b55733e8f89)
| -rw-r--r-- | libs/gui/SensorManager.cpp | 2 |
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(); } |