commit 230978217f4034aae0a129790a32520b03b7fdc0
author Brian Duddie <bduddie@google.com> Thu Jun 06 16:43:41 2019 -0700
committer Arjun Garg <arjgarg@google.com> Thu Jul 11 12:08:33 2019 -0700
tree 4e6317563752c754f9899864862bfee177157350
parent 46f91c5b784419efc7bec05afc54484735dd332e

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 4b23ed10ae94ff9e991cc6c1d0946b55733e8f89)

libs/gui/SensorManager.cpp

diff --git a/libs/gui/SensorManager.cpp b/libs/gui/SensorManager.cpp
index 225bfa8..2e245bf 100644
--- a/libs/gui/SensorManager.cpp
+++ b/libs/gui/SensorManager.cpp
@@ -90,7 +90,7 @@
 
 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();
 }