Merge "Add limited axes imu types to sensors_event_t"
diff --git a/OWNERS b/OWNERS
index b6b18da..53e5f73 100644
--- a/OWNERS
+++ b/OWNERS
@@ -5,3 +5,4 @@
smoreland@google.com
swillden@google.com
per-file include/hardware/camera*=etalvala@google.com
+per-file include/hardware/sensors*=bduddie@google.com
diff --git a/include/hardware/sensors-base.h b/include/hardware/sensors-base.h
index b88a8c2..7dc42a0 100644
--- a/include/hardware/sensors-base.h
+++ b/include/hardware/sensors-base.h
@@ -53,6 +53,10 @@
SENSOR_TYPE_ACCELEROMETER_UNCALIBRATED = 35,
SENSOR_TYPE_HINGE_ANGLE = 36,
SENSOR_TYPE_HEAD_TRACKER = 37,
+ SENSOR_TYPE_ACCELEROMETER_LIMITED_AXES = 38,
+ SENSOR_TYPE_GYROSCOPE_LIMITED_AXES = 39,
+ SENSOR_TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED = 40,
+ SENSOR_TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED = 41,
SENSOR_TYPE_DEVICE_PRIVATE_BASE = 65536 /* 0x10000 */,
};
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index 9ee1354..589aba0 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -187,6 +187,10 @@
#define SENSOR_STRING_TYPE_ACCELEROMETER_UNCALIBRATED "android.sensor.accelerometer_uncalibrated"
#define SENSOR_STRING_TYPE_HINGE_ANGLE "android.sensor.hinge_angle"
#define SENSOR_STRING_TYPE_HEAD_TRACKER "android.sensor.head_tracker"
+#define SENSOR_STRING_TYPE_ACCELEROMETER_LIMITED_AXES "android.sensor.accelerometer_limited_axes"
+#define SENSOR_STRING_TYPE_GYROSCOPE_LIMITED_AXES "android.sensor.gyroscope_limited_axes"
+#define SENSOR_STRING_TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED "android.sensor.accelerometer_limited_axes_uncalibrated"
+#define SENSOR_STRING_TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED "android.sensor.gyroscope_limited_axes_uncalibrated"
/**
* Values returned by the accelerometer in various locations in the universe.