Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f49ea8d authored by Chenjie Luo's avatar Chenjie Luo Committed by Android Git Automerger
Browse files

am f369a4fc: am 24c8f4b1: am 177a4166: am 99426810: Merge "Check for the... 

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

* commit 'f369a4fc':
  Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
parents dd28d991 f369a4fc

services/sensorservice/SensorService.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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