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

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 635020e..8c3c311 100644 (file)
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -93,6 +93,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))

diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 053d153..9d0aa24 100644 (file)
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -297,6 +297,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 +308,7 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
                     String16(mRequiredPermission));
         }
     }
+#endif
 }
 
 Sensor::~Sensor() {