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:10:13 -0700 |
| commit | 5f1a7cfd320022c90d6e06ab78d602459177736c (patch) | |
| tree | d5382e559a5693bf020de267a4a597a6cb4beae3 | |
| parent | 19ffc4987014b1df7914a6666e19f98cb9706352 (diff) | |
| download | native-nougat-mr2-security-release.tar.gz | |
Fix race between SensorManager ctor and callbackandroid-7.1.2_r39android-7.1.2_r38nougat-mr2-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 9fcf9ab2e3..f49dd6e703 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(); } |