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

Unverified Commit 90be00c9 authored by Christopher N. Hesse's avatar Christopher N. Hesse Committed by Michael Bestas
Browse files

sensor: Allow devices to skip the permission request 

This is needed by Samsung devices with pre-M sensor
blobs which have support for SENSOR_TYPE_HEART_RATE
or body sensors in general.
These HALs somehow segfault on the flagged code.

Change-Id: I698f4129e71b683f6f063f00da79f32a5f521149

sensor: Skip additional permission request checks

* Some legacy Samsung HALs supporting BODY_SENSOR types are
incompatible with the new permission checks added in M.
Extend the NO_SENSOR_PERMISSION_CHECK flags to cover more
of the actual checks.

Change-Id: I27c87fe9434994ca3fc40dfcb5f4fb44504eb610
parent 402f563a

libs/gui/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ ifeq ($(TARGET_BOARD_PLATFORM), tegra3) 
	LOCAL_CFLAGS += -DDONT_USE_FENCE_SYNC

endif



ifeq ($(TARGET_NO_SENSOR_PERMISSION_CHECK),true)

LOCAL_CPPFLAGS += -DNO_SENSOR_PERMISSION_CHECK

endif



include $(BUILD_SHARED_LIBRARY)



ifeq (,$(ONE_SHOT_MAKEFILE))

libs/gui/Sensor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -120,9 +120,11 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        break;

    case SENSOR_TYPE_HEART_RATE: {

        mStringType = SENSOR_STRING_TYPE_HEART_RATE;

#ifndef NO_SENSOR_PERMISSION_CHECK

        mRequiredPermission = SENSOR_PERMISSION_BODY_SENSORS;

        AppOpsManager appOps;

        mRequiredAppOp = appOps.permissionToOpCode(String16(SENSOR_PERMISSION_BODY_SENSORS));

#endif

        mFlags |= SENSOR_FLAG_ON_CHANGE_MODE;

        } break;

    case SENSOR_TYPE_LIGHT:
@@ -249,6 +251,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor.stringType) {

            mStringType = hwSensor.stringType;

        }

#ifndef NO_SENSOR_PERMISSION_CHECK

        if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor.requiredPermission) {

            mRequiredPermission = hwSensor.requiredPermission;

            if (!strcmp(mRequiredPermission, SENSOR_PERMISSION_BODY_SENSORS)) {
@@ -256,6 +259,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
                mRequiredAppOp = appOps.permissionToOpCode(String16(SENSOR_PERMISSION_BODY_SENSORS));

            }

        }

#endif



        if (halVersion >= SENSORS_DEVICE_API_VERSION_1_3) {

            mFlags = static_cast<uint32_t>(hwSensor.flags);
@@ -297,6 +301,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        mFlags |= (hwSensor.flags & DATA_INJECTION_MASK);

    }



#ifndef NO_SENSOR_PERMISSION_CHECK

    if (mRequiredPermission.length() > 0) {

        // If the sensor is protected by a permission we need to know if it is

        // a runtime one to determine whether we can use the permission cache.
@@ -307,6 +312,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
                    String16(mRequiredPermission));

        }

    }

#endif

}



Sensor::~Sensor() {