am 8ae7c02e: am ffac23b2: am 4b84704b: Ignore flush complete events when recording last value for a sensor.

* commit '8ae7c02e6ffb5533958d04ac0d8f4a8d77fdb734':
  Ignore flush complete events when recording last value for a sensor.
This commit is contained in:
Aravind Akella 2014-03-06 02:35:17 +00:00 committed by Android Git Automerger
commit e7643e431a
2 changed files with 13 additions and 12 deletions

View File

@ -426,20 +426,21 @@ bool SensorService::threadLoop()
} }
void SensorService::recordLastValue( void SensorService::recordLastValue(
sensors_event_t const * buffer, size_t count) const sensors_event_t* buffer, size_t count) {
{
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
// record the last event for each sensor const sensors_event_t* last = NULL;
int32_t prev = buffer[0].sensor; for (size_t i = 0; i < count; i++) {
for (size_t i=1 ; i<count ; i++) { const sensors_event_t* event = &buffer[i];
// record the last event of each sensor type in this buffer if (event->type != SENSOR_TYPE_META_DATA) {
int32_t curr = buffer[i].sensor; if (last && event->sensor != last->sensor) {
if (curr != prev) { mLastEventSeen.editValueFor(last->sensor) = *last;
mLastEventSeen.editValueFor(prev) = buffer[i-1]; }
prev = curr; last = event;
} }
} }
mLastEventSeen.editValueFor(prev) = buffer[count-1]; if (last) {
mLastEventSeen.editValueFor(last->sensor) = *last;
}
} }
void SensorService::sortEventBuffer(sensors_event_t* buffer, size_t count) void SensorService::sortEventBuffer(sensors_event_t* buffer, size_t count)

View File

@ -131,7 +131,7 @@ class SensorService :
String8 getSensorName(int handle) const; String8 getSensorName(int handle) const;
bool isVirtualSensor(int handle) const; bool isVirtualSensor(int handle) const;
void recordLastValue(sensors_event_t const * buffer, size_t count); void recordLastValue(const sensors_event_t* buffer, size_t count);
static void sortEventBuffer(sensors_event_t* buffer, size_t count); static void sortEventBuffer(sensors_event_t* buffer, size_t count);
Sensor registerSensor(SensorInterface* sensor); Sensor registerSensor(SensorInterface* sensor);
Sensor registerVirtualSensor(SensorInterface* sensor); Sensor registerVirtualSensor(SensorInterface* sensor);