diff options
| author | Chenjie Luo <cjluo@google.com> | 2015-07-22 06:26:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 06:26:27 +0000 |
| commit | 99426810e4828719be84a0f8c186161578512e93 (patch) | |
| tree | 22d3c9e444d91df65ec71a67da4ddfcaaed2395d | |
| parent | f892f9141721a3805d18da2db0e1c17f1a99feb0 (diff) | |
| parent | f504789dd3b3073de176fd2fa09dd9fc9de5bc1f (diff) | |
| download | native-99426810e4828719be84a0f8c186161578512e93.tar.gz | |
Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index bb2d4f36e4..40b21a96a0 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -84,7 +84,7 @@ void SensorService::onFirstRef() ssize_t count = dev.getSensorList(&list); if (count > 0) { ssize_t orientationIndex = -1; - bool hasGyro = false; + bool hasGyro = false, hasAccel = false, hasMag = false; uint32_t virtualSensorsNeeds = (1<<SENSOR_TYPE_GRAVITY) | (1<<SENSOR_TYPE_LINEAR_ACCELERATION) | @@ -94,6 +94,12 @@ void SensorService::onFirstRef() for (ssize_t i=0 ; i<count ; i++) { registerSensor( new HardwareSensor(list[i]) ); switch (list[i].type) { + case SENSOR_TYPE_ACCELEROMETER: + hasAccel = true; + break; + case SENSOR_TYPE_MAGNETIC_FIELD: + hasMag = true; + break; case SENSOR_TYPE_ORIENTATION: orientationIndex = i; break; @@ -117,7 +123,7 @@ void SensorService::onFirstRef() // build the sensor list returned to users mUserSensorList = mSensorList; - if (hasGyro) { + if (hasGyro && hasAccel && hasMag) { Sensor aSensor; // Add Android virtual sensors if they're not already |