Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86

diff --git a/Android.mk b/Android.mk
index 03e3264..ab13e03 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -38,8 +38,8 @@ include $(CLEAR_VARS)
 include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bdw_rvp
 LOCAL_MODULE := sensors.bdw_rvp
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bdw_rvp/BoardConfig.cpp
@@ -49,8 +49,8 @@ include $(CLEAR_VARS)
 include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bdw_wsb
 LOCAL_MODULE := sensors.bdw_wsb
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bdw_wsb/BoardConfig.cpp
@@ -60,8 +60,8 @@ include $(CLEAR_VARS)
 include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bytm
 LOCAL_MODULE := sensors.bytm
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bytm/BoardConfig.cpp
@@ -71,8 +71,8 @@ include $(CLEAR_VARS)
 include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/hsb
 LOCAL_MODULE := sensors.hsb
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
 LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) hsb/BoardConfig.cpp

diff --git a/HidSensor_ALS.cpp b/HidSensor_ALS.cpp
index fb7e978..0210f52 100644 (file)
--- a/HidSensor_ALS.cpp
+++ b/HidSensor_ALS.cpp
@@ -33,8 +33,8 @@ struct als_sample{
 
 const struct sensor_t ALSSensor::sSensorInfo_als = {
     "HID_SENSOR ALS", "Intel", 1, SENSORS_LIGHT_HANDLE, SENSOR_TYPE_LIGHT,
-    50000.0f, 1.0f, 0.75f, 0, 0, 0, {}
-    ,
+    50000.0f, 1.0f, 0.75f, 0, 0, 0,
+    SENSOR_STRING_TYPE_LIGHT, "", 0 , SENSOR_FLAG_CONTINUOUS_MODE, {}
 };
 const int retry_cnt = 10;
 

diff --git a/HidSensor_Accel3D.cpp b/HidSensor_Accel3D.cpp
index 5b8d924..23a0c7a 100644 (file)
--- a/HidSensor_Accel3D.cpp
+++ b/HidSensor_Accel3D.cpp
@@ -38,7 +38,8 @@ struct accel_3d_sample{
 
 const struct sensor_t AccelSensor::sSensorInfo_accel3D = {
     "HID_SENSOR Accelerometer 3D", "Intel", 1, SENSORS_ACCELERATION_HANDLE,
-    SENSOR_TYPE_ACCELEROMETER, RANGE_A, RESOLUTION_A, 0.23f, 10000, 0, 0, {}
+    SENSOR_TYPE_ACCELEROMETER, RANGE_A, RESOLUTION_A, 0.23f, 10000, 0, 0,
+    SENSOR_STRING_TYPE_ACCELEROMETER, "", 0 , SENSOR_FLAG_CONTINUOUS_MODE, {}
 };
 
 const long HID_USAGE_SENSOR_UNITS_G = 0x1A;

diff --git a/HidSensor_Compass3D.cpp b/HidSensor_Compass3D.cpp
index 64b9ef3..1d9e84f 100644 (file)
--- a/HidSensor_Compass3D.cpp
+++ b/HidSensor_Compass3D.cpp
@@ -38,7 +38,8 @@ struct compass_3d_sample{
 
 const struct sensor_t CompassSensor::sSensorInfo_compass3D = {
     "HID_SENSOR Compass 3D", "Intel", 1, SENSORS_MAGNETIC_FIELD_HANDLE,
-    SENSOR_TYPE_MAGNETIC_FIELD, RANGE_M, RESOLUTION_M, 0.1f, 0, 0, 0, {}
+    SENSOR_TYPE_MAGNETIC_FIELD, RANGE_M, RESOLUTION_M, 0.1f, 0, 0, 0,
+    SENSOR_STRING_TYPE_MAGNETIC_FIELD, "", 0 , SENSOR_FLAG_CONTINUOUS_MODE, {}
 };
 const int retry_cnt = 10;
 

diff --git a/HidSensor_Gyro3D.cpp b/HidSensor_Gyro3D.cpp
index d719ab7..dac7e32 100644 (file)
--- a/HidSensor_Gyro3D.cpp
+++ b/HidSensor_Gyro3D.cpp
@@ -38,7 +38,8 @@ struct gyro_3d_sample{
 
 const struct sensor_t GyroSensor::sSensorInfo_gyro3D = {
     "HID_SENSOR Gyro 3D", "Intel", 1, SENSORS_GYROSCOPE_HANDLE,
-    SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, RESOLUTION_GYRO, 6.10f, 10000, 0, 0, {}
+    SENSOR_TYPE_GYROSCOPE, RANGE_GYRO, RESOLUTION_GYRO, 6.10f, 10000, 0, 0,
+    SENSOR_STRING_TYPE_GYROSCOPE, "", 0 , SENSOR_FLAG_CONTINUOUS_MODE, {}
 };
 const int HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED      = 0x00;
 const int HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND = 0x15;

diff --git a/OrientationSensor.cpp b/OrientationSensor.cpp
index 5941bde..29ef041 100644 (file)
--- a/OrientationSensor.cpp
+++ b/OrientationSensor.cpp
@@ -31,6 +31,10 @@ const struct sensor_t OrientationSensor::sSensorInfo_orientation = {
     .minDelay   = 0,
     .fifoReservedEventCount = 0,
     .fifoMaxEventCount      = 0,
+    .stringType = SENSOR_STRING_TYPE_ORIENTATION,
+    .requiredPermission     = "",
+    .maxDelay   = 0,
+    .flags      = SENSOR_FLAG_CONTINUOUS_MODE,
     .reserved   = {},
 };
 

diff --git a/RotVecSensor.cpp b/RotVecSensor.cpp
index 6ba1dad..0f10be5 100644 (file)
--- a/RotVecSensor.cpp
+++ b/RotVecSensor.cpp
@@ -31,6 +31,10 @@ const struct sensor_t RotVecSensor::sSensorInfo_rotvec = {
     .minDelay   = 0,
     .fifoReservedEventCount = 0,
     .fifoMaxEventCount      = 0,
+    .stringType = SENSOR_STRING_TYPE_ROTATION_VECTOR,
+    .requiredPermission     = "",
+    .maxDelay   = 0,
+    .flags      = SENSOR_FLAG_CONTINUOUS_MODE,
     .reserved   = {},
 };
 

diff --git a/SynthCompassSensor.cpp b/SynthCompassSensor.cpp
index 4d7eb51..af758db 100644 (file)
--- a/SynthCompassSensor.cpp
+++ b/SynthCompassSensor.cpp
@@ -47,6 +47,10 @@ const struct sensor_t SynthCompassSensor::sSensorInfo_compass = {
     .minDelay   = 0,
     .fifoReservedEventCount = 0,
     .fifoMaxEventCount      = 0,
+    .stringType = SENSOR_STRING_TYPE_MAGNETIC_FIELD,
+    .requiredPermission     = "",
+    .maxDelay   = 0,
+    .flags      = SENSOR_FLAG_CONTINUOUS_MODE,
     .reserved   = {},
 };
 

diff --git a/sensors.cpp b/sensors.cpp
index 7b92149..9cc12aa 100644 (file)
--- a/sensors.cpp
+++ b/sensors.cpp
@@ -27,7 +27,6 @@
 #include <assert.h>
 
 #include <linux/input.h>
-#include <linux/akm8973.h>
 
 #include <utils/Atomic.h>
 #include <utils/Log.h>