commit 10819cc3919732750c86d98a4eaf1cc118c4ee1d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 02 13:13:02 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 02 13:13:02 2019 +0000
tree e2a8289ffb75cd0b791efcc93b9f84913364de43
parent 231a12189b2b820843ebf5d002876a23e0890c09
parent 35e7a08f3dc89d6cb55b90d3b10fa93bd552d140

Merge changes from topic "am-76da18a1-f110-471a-a87f-39868ce95109" into oc-dev

* changes:
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e am: 648bed8273 skipped: d0a1025778
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e am: 648bed8273
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae
  Fix race between SensorManager ctor and callback

libs/sensor/SensorManager.cpp

diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index 3fbc5eb..1ab9489 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -93,7 +93,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();
 }