diff options
author | Mathias Agopian <mathias@google.com> | 2010-11-15 13:14:59 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 13:14:59 -0800 |
commit | 305bc0fe977f6197bfae847dbaf58916cf8980ba (patch) | |
tree | e748d19b7324b36e19c7ba002589b819c35ce9a7 | |
parent | 9e291a4b9922719165145434217e100e2118860d (diff) | |
parent | f33a6e9645517b9bcf7236bc6f2b7fe182a0137d (diff) | |
download | base-305bc0fe977f6197bfae847dbaf58916cf8980ba.tar.gz |
Merge "Fix a race condition in sensormanager" into gingerbread
-rw-r--r-- | services/sensorservice/SensorService.cpp | 6 | ||||
-rw-r--r-- | services/sensorservice/SensorService.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index b5e73ac5e78f..22a45df0603c 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -464,6 +464,7 @@ void SensorService::SensorEventConnection::onFirstRef() } bool SensorService::SensorEventConnection::addSensor(int32_t handle) { + Mutex::Autolock _l(mConnectionLock); if (mSensorInfo.indexOfKey(handle) <= 0) { SensorInfo info; mSensorInfo.add(handle, info); @@ -473,6 +474,7 @@ bool SensorService::SensorEventConnection::addSensor(int32_t handle) { } bool SensorService::SensorEventConnection::removeSensor(int32_t handle) { + Mutex::Autolock _l(mConnectionLock); if (mSensorInfo.removeItem(handle) >= 0) { return true; } @@ -480,16 +482,19 @@ bool SensorService::SensorEventConnection::removeSensor(int32_t handle) { } bool SensorService::SensorEventConnection::hasSensor(int32_t handle) const { + Mutex::Autolock _l(mConnectionLock); return mSensorInfo.indexOfKey(handle) >= 0; } bool SensorService::SensorEventConnection::hasAnySensor() const { + Mutex::Autolock _l(mConnectionLock); return mSensorInfo.size() ? true : false; } status_t SensorService::SensorEventConnection::setEventRateLocked( int handle, nsecs_t ns) { + Mutex::Autolock _l(mConnectionLock); ssize_t index = mSensorInfo.indexOfKey(handle); if (index >= 0) { SensorInfo& info = mSensorInfo.editValueFor(handle); @@ -506,6 +511,7 @@ status_t SensorService::SensorEventConnection::sendEvents( // filter out events not for this connection size_t count = 0; if (scratch) { + Mutex::Autolock _l(mConnectionLock); size_t i=0; while (i<numEvents) { const int32_t curr = buffer[i].sensor; diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h index b442779d5ac0..c0922f553c76 100644 --- a/services/sensorservice/SensorService.h +++ b/services/sensorservice/SensorService.h @@ -75,8 +75,9 @@ class SensorService : sp<SensorService> const mService; sp<SensorChannel> const mChannel; + mutable Mutex mConnectionLock; - // protected by SensorService::mLock + // protected mConnectionLock struct SensorInfo { SensorInfo() : ns(DEFAULT_EVENTS_PERIOD) { } nsecs_t ns; |