commit 8bbd6f4f0d222b64496f7bda25d123c70dbf3e6c
author Brian Duddie <bduddie@google.com> Thu Jun 06 16:43:41 2019 -0700
committer Brian Duddie <bduddie@google.com> Mon Jul 01 17:52:50 2019 +0000
tree 4a90f2be910bf42178f0b96cf942aae6ca58a5f6
parent ab9e462966dfb738d9b4f00ed73ecbb8ad6c2df5

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

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index 5840d51..96d5eb9 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -94,7 +94,7 @@
 
 SensorManager::SensorManager(const String16& opPackageName)
     : mSensorList(nullptr), mOpPackageName(opPackageName), mDirectConnectionHandle(1) {
-    // okay we're not locked here, but it's not needed during construction
+    Mutex::Autolock _l(mLock);
     assertStateLocked();
 }