Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index 4f9de17..548af7d 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -356,10 +356,10 @@
* In the future this list will expand greatly to accommodate asymmetric key import/export.
*/
typedef enum {
- KM_KEY_FORMAT_X509, /* for public key export, required */
- KM_KEY_FORMAT_PKCS8, /* for asymmetric key pair import, required */
- KM_KEY_FORMAT_PKCS12, /* for asymmetric key pair import, not required */
- KM_KEY_FORMAT_RAW, /* for symmetric key import, required */
+ KM_KEY_FORMAT_X509 = 0, /* for public key export, required */
+ KM_KEY_FORMAT_PKCS8 = 1, /* for asymmetric key pair import, required */
+ KM_KEY_FORMAT_PKCS12 = 2, /* for asymmetric key pair import, not required */
+ KM_KEY_FORMAT_RAW = 3, /* for symmetric key import, required */
} keymaster_key_format_t;
/**
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index f0773d5..e917c0a 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -602,6 +602,22 @@
#define SENSOR_TYPE_PICK_UP_GESTURE (25)
#define SENSOR_STRING_TYPE_PICK_UP_GESTURE "android.sensor.pick_up_gesture"
+/*
+ * SENSOR_TYPE_WRIST_TILT_GESTURE
+ * trigger-mode: special
+ * wake-up sensor: yes
+ *
+ * A sensor of this type triggers an event each time a tilt of the wrist-worn
+ * device is detected.
+ *
+ * This sensor must be low power, as it is likely to be activated 24/7.
+ * The only allowed value to return is 1.0.
+ *
+ * Implement only the wake-up version of this sensor.
+ */
+#define SENSOR_TYPE_WRIST_TILT_GESTURE (26)
+#define SENSOR_STRING_TYPE_WRIST_TILT_GESTURE "android.sensor.wrist_tilt_gesture"
+
/**
* Values returned by the accelerometer in various locations in the universe.
* all values are in SI units (m/s^2)