From 8b483596168805d95740b979d21098b25188b6da Mon Sep 17 00:00:00 2001 From: Ben Fennema Date: Wed, 2 Dec 2015 01:04:06 +0000 Subject: Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" This reverts commit 4c690fc64eba65e2a13ece82e6c81367a48a003a. Change-Id: I1ebf4c866606e004e2120d106f32973700f8bfeb --- include/hardware/sensors.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h index 611fff6f..51bffe11 100644 --- a/include/hardware/sensors.h +++ b/include/hardware/sensors.h @@ -35,8 +35,7 @@ __BEGIN_DECLS #define SENSORS_DEVICE_API_VERSION_1_1 HARDWARE_DEVICE_API_VERSION_2(1, 1, SENSORS_HEADER_VERSION) #define SENSORS_DEVICE_API_VERSION_1_2 HARDWARE_DEVICE_API_VERSION_2(1, 2, SENSORS_HEADER_VERSION) #define SENSORS_DEVICE_API_VERSION_1_3 HARDWARE_DEVICE_API_VERSION_2(1, 3, SENSORS_HEADER_VERSION) -#define SENSORS_DEVICE_API_VERSION_1_3_5 HARDWARE_DEVICE_API_VERSION_2(1, 4, SENSORS_HEADER_VERSION) -#define SENSORS_DEVICE_API_VERSION_1_4 HARDWARE_DEVICE_API_VERSION_2(1, 5, SENSORS_HEADER_VERSION) +#define SENSORS_DEVICE_API_VERSION_1_4 HARDWARE_DEVICE_API_VERSION_2(1, 4, SENSORS_HEADER_VERSION) /** * Please see the Sensors section of source.android.com for an @@ -859,13 +858,6 @@ struct sensors_module_t { * -EPERM if operation is not allowed */ int (*set_operation_mode)(unsigned int mode); - - /** - * Set string to sensor HAL, which includes physical settings. - * Content of string is hardware/vendor specific. - * Availability: SENSORS_DEVICE_API_VERSION_1_3_5 - **/ - int (*set_sensor_physical_data)(const char* physicaldata); }; struct sensor_t { -- cgit v1.2.3