commit 2cd1ad424eb5bcda29e3169bf81fc59e9113d650
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jul 01 20:58:38 2019 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Jul 01 20:58:38 2019 +0000
tree 4e6317563752c754f9899864862bfee177157350
parent fbdb526a6ab454a66ececf7a5d4827e6dc74dc2b
parent c88995f5d839c079ae2a9d88af81c9ed407068f6

[automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8

Change-Id: Ifd8e06c0a18b17df30295017d86bb7fcb2ffef94

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();
 }