Merge "Add the second IMEI tag"
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index 6f4baf8..7b844b8 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -367,9 +367,11 @@
float accuracy;
} heading_event_t;
+// LINT.IfChange
/**
* Union of the various types of sensor data
* that can be returned.
+ * This type needs to remain identical to ASensorEvent.
*/
typedef struct sensors_event_t {
/* must be sizeof(struct sensors_event_t) */
@@ -479,6 +481,7 @@
uint32_t reserved1[3];
} sensors_event_t;
+// LINT.ThenChange (frameworks/native/include/android/sensor.h)
/* see SENSOR_TYPE_META_DATA */