commit 1816557bd517fc7a460d985e437cbc401a43f835
author Brian Duddie <bduddie@google.com> Thu Jun 06 16:43:41 2019 -0700
committer Arjun Garg <arjgarg@google.com> Fri Jul 12 15:32:48 2019 -0700
tree bf5e64580a14946c775494ec0bd649c0265f0142
parent f584248b4970d081d1739d610350eb5985e986bd

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

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index b9ae524..c97e4da 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -94,7 +94,7 @@
 
 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();
 }