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

Commit f400cd1f authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

sensors: Add workaround for Foxconn's broken sensor data 

FIH has a tendency to add in-kernel "shortcuts" for stuff that's usually
controlled in userspace, and disabling the screen+backlight on proximity
was one of those. That implementation is, however, buggy, and on top of that
it's colliding with the standard userspace implementation.

This should be corrected at the sensors HAL, but reimplementing that
has been a work-in-progress for quite some time now and still isn't functional.
So, for now, toggle a workaround with TARGET_HAS_FOXCONN_SENSORS, and
convert the data into the kind of values the framework expects.

Change-Id: Ib974af729ce0511668c835b9078831330b874a1f
parent e1e08d58

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_HAS_FOXCONN_SENSORS),true)

    LOCAL_CFLAGS += -DFOXCONN_SENSORS

endif



# need "-lrt" on Linux simulator to pick up clock_gettime

ifeq ($(TARGET_SIMULATOR),true)

	ifeq ($(HOST_OS),linux)

services/sensorservice/SensorDevice.cpp

+11 −0
Original line number Diff line number Diff line
@@ -221,6 +221,17 @@ ssize_t SensorDevice::poll(sensors_event_t* buffer, size_t count) { 
            buffer[pollsDone].acceleration = oldBuffer.vector;

            buffer[pollsDone].temperature = oldBuffer.temperature;

            LOGV("Adding results for sensor %d", buffer[pollsDone].sensor);

#ifdef FOXCONN_SENSORS

            /* Fix ridiculous API breakages from FIH. */

            /* These idiots are returning -1 for FAR, and 1 for NEAR */

            if (sensorType == SENSOR_TYPE_PROXIMITY) {

                if (buffer[pollsDone].distance > 0) {

                    buffer[pollsDone].distance = 0;

                } else {

                    buffer[pollsDone].distance = 1;

                }

            }

#endif

            pollsDone++;

        }

        return pollsDone;