From 650536f6d1470a044b417482557806b10c356724 Mon Sep 17 00:00:00 2001 From: Brian Duddie Date: Thu, 6 Jun 2019 16:43:41 -0700 Subject: [PATCH 1/1] 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 (cherry picked from commit 231a12189b2b820843ebf5d002876a23e0890c09) --- libs/sensor/SensorManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); } -- 2.11.0