summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Duddie <bduddie@google.com>2019-07-01 19:19:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-01 19:19:07 -0700
commit4158f80438f1e4a9c3eb2b58e55be4770d8f0be7 (patch)
tree7187d667ce6ecc9fdafdc3c504ff3f69e7e72424
parent5b788aa514935cc3785e93669bbd96cb347d5f08 (diff)
parentade39600c57a35552d6dc035ed2a2ce974ca99ac (diff)
downloadnative-4158f80438f1e4a9c3eb2b58e55be4770d8f0be7.tar.gz
Fix race between SensorManager ctor and callback am: 231a12189b am: 4245ab3a0f
am: ade39600c5 Change-Id: I027ea10e13f9cabad72fe96739a8e25fe0b69881
-rw-r--r--libs/sensor/SensorManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/sensor/SensorManager.cpp b/libs/sensor/SensorManager.cpp
index b9ae524ee8..c97e4da9b5 100644
--- a/libs/sensor/SensorManager.cpp
+++ b/libs/sensor/SensorManager.cpp
@@ -94,7 +94,7 @@ SensorManager& SensorManager::getInstanceForPackage(const String16& packageName)
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();
}