diff options
| author | Christopher N. Hesse <raymanfx@gmail.com> | 2015-11-29 00:39:51 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-18 15:21:53 -0800 |
| commit | 8befd14c4a12ec99b0cc60157921cb1108283b3e (patch) | |
| tree | 07b4ae3667cd641311fec3db1b5e3c57d27e62bc /libs/gui | |
| parent | 31ab17fb0c52b1d8aa7b556c0d18927eb92e2208 (diff) | |
| download | frameworks_native-8befd14c4a12ec99b0cc60157921cb1108283b3e.zip frameworks_native-8befd14c4a12ec99b0cc60157921cb1108283b3e.tar.gz frameworks_native-8befd14c4a12ec99b0cc60157921cb1108283b3e.tar.bz2 | |
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
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/Android.mk | 4 | ||||
| -rw-r--r-- | libs/gui/Sensor.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk index 8a965dd..76aec6e 100644 --- a/libs/gui/Android.mk +++ b/libs/gui/Android.mk @@ -91,6 +91,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 235cbbd..e62c585 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -267,6 +267,7 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) } } +#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. @@ -277,6 +278,7 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) String16(mRequiredPermission)); } } +#endif } Sensor::~Sensor() |