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

am 99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev

Browse Source 
* commit '99426810e4828719be84a0f8c186161578512e93':
  Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
This commit is contained in:
Chenjie Luo 2015-07-22 20:23:43 +00:00 committed by Android Git Automerger
commit 177a416625
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/sensorservice/SensorService.cpp
View File

@ -84,7 +84,7 @@ void SensorService::onFirstRef()
ssize_t count = dev.getSensorList(&list); ssize_t count = dev.getSensorList(&list);
if (count > 0) { if (count > 0) {
ssize_t orientationIndex = -1; ssize_t orientationIndex = -1;
bool hasGyro = false; bool hasGyro = false, hasAccel = false, hasMag = false;
uint32_t virtualSensorsNeeds = uint32_t virtualSensorsNeeds =
(1<<SENSOR_TYPE_GRAVITY) | (1<<SENSOR_TYPE_GRAVITY) |
(1<<SENSOR_TYPE_LINEAR_ACCELERATION) | (1<<SENSOR_TYPE_LINEAR_ACCELERATION) |
@ -94,6 +94,12 @@ void SensorService::onFirstRef()
for (ssize_t i=0 ; i<count ; i++) { for (ssize_t i=0 ; i<count ; i++) {
registerSensor( new HardwareSensor(list[i]) ); registerSensor( new HardwareSensor(list[i]) );
switch (list[i].type) { switch (list[i].type) {
case SENSOR_TYPE_ACCELEROMETER:
hasAccel = true;
break;
case SENSOR_TYPE_MAGNETIC_FIELD:
hasMag = true;
break;
case SENSOR_TYPE_ORIENTATION: case SENSOR_TYPE_ORIENTATION:
orientationIndex = i; orientationIndex = i;
break; break;
@ -117,7 +123,7 @@ void SensorService::onFirstRef()
// build the sensor list returned to users // build the sensor list returned to users
mUserSensorList = mSensorList; mUserSensorList = mSensorList;
if (hasGyro) { if (hasGyro && hasAccel && hasMag) {
Sensor aSensor; Sensor aSensor;
// Add Android virtual sensors if they're not already // Add Android virtual sensors if they're not already