ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 46417b84: Merge "Bug fixes for SensorService" into klp-dev 

* commit '46417b845a257d6725adf048a3cfad6306218e9b':
  Bug fixes for SensorService
This commit is contained in:
Aravind Akella 2013-10-25 18:10:55 -07:00 committed by Android Git Automerger
parent fddab47617 46417b845a
commit 245c43395b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/sensorservice/SensorService.cpp
View File

@ -480,6 +480,11 @@ String8 SensorService::getSensorName(int handle) const {
return result;
}
bool SensorService::isVirtualSensor(int handle) const {
SensorInterface* sensor = mSensorMap.valueFor(handle);
return sensor->isVirtual();
}
Vector<Sensor> SensorService::getSensorList()
{
char value[PROPERTY_VALUE_MAX];
@ -858,6 +863,11 @@ status_t SensorService::SensorEventConnection::sendEvents(
}
}
// Early return if there are no events for this connection.
if (count == 0) {
return status_t(NO_ERROR);
}
// NOTE: ASensorEvent and sensors_event_t are the same type
ssize_t size = SensorEventQueue::write(mChannel,
reinterpret_cast<ASensorEvent const*>(scratch), count);
@ -922,7 +932,7 @@ status_t SensorService::SensorEventConnection::flush() {
// Loop through all sensors for this connection and call flush on each of them.
for (size_t i = 0; i < mSensorInfo.size(); ++i) {
const int handle = mSensorInfo.keyAt(i);
if (halVersion < SENSORS_DEVICE_API_VERSION_1_1) {
if (halVersion < SENSORS_DEVICE_API_VERSION_1_1 || mService->isVirtualSensor(handle)) {
// For older devices just increment pending flush count which will send a trivial
// flush complete event.
FlushInfo& flushInfo = mSensorInfo.editValueFor(handle);

1
services/sensorservice/SensorService.h
View File

@ -130,6 +130,7 @@ class SensorService :
DefaultKeyedVector<int, SensorInterface*> getActiveVirtualSensors() const;
String8 getSensorName(int handle) const;
bool isVirtualSensor(int handle) const;
void recordLastValue(sensors_event_t const * buffer, size_t count);
static void sortEventBuffer(sensors_event_t* buffer, size_t count);
Sensor registerSensor(SensorInterface* sensor);