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

Commit f08c19fb authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Add TARGET_SENSORS_NO_OPEN_CHECK for betelgeuse (Folio100) support" into gingerbread

parents 58efdfbf 632c3cd6

services/sensorservice/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ ifeq ($(TARGET_USES_OLD_LIBSENSORS_HAL),true) 
    LOCAL_CFLAGS += -DENABLE_SENSORS_COMPAT

endif



ifeq ($(TARGET_SENSORS_NO_OPEN_CHECK),true)

    LOCAL_CFLAGS += -DSENSORS_NO_OPEN_CHECK

endif



ifeq ($(TARGET_HAS_FOXCONN_SENSORS),true)

    LOCAL_CFLAGS += -DFOXCONN_SENSORS

endif

services/sensorservice/SensorDevice.cpp

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ SensorDevice::SensorDevice() 


    if (mSensorModule) {

#ifdef ENABLE_SENSORS_COMPAT

#ifdef SENSORS_NO_OPEN_CHECK

        sensors_control_open(&mSensorModule->common, &mSensorControlDevice) ;

        sensors_data_open(&mSensorModule->common, &mSensorDataDevice) ;

        mOldSensorsCompatMode = true;

#else

        if (!sensors_control_open(&mSensorModule->common, &mSensorControlDevice)) {

            if (sensors_data_open(&mSensorModule->common, &mSensorDataDevice)) {

                LOGE("couldn't open data device in backwards-compat mode for module %s (%s)",
@@ -123,6 +128,7 @@ SensorDevice::SensorDevice() 
            LOGE("couldn't open control device in backwards-compat mode for module %s (%s)",

                    SENSORS_HARDWARE_MODULE_ID, strerror(-err));

        }

#endif

#else

        err = sensors_open(&mSensorModule->common, &mSensorDevice);

        LOGE_IF(err, "couldn't open device for module %s (%s)",