Merge "Fix build error in stub soundtrigger HAL" into nyc-dev
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index a2d9b2e..14b8aa5 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -116,6 +116,35 @@
SENSOR_HAL_DATA_INJECTION_MODE = 0x1
};
+#define SENSOR_FLAG_MASK(nbit, shift) (((1<<(nbit))-1)<<(shift))
+#define SENSOR_FLAG_MASK_1(shift) SENSOR_FLAG_MASK(1, shift)
+
+/*
+ * Mask and shift for reporting mode sensor flags defined above.
+ */
+#define REPORTING_MODE_SHIFT (1)
+#define REPORTING_MODE_NBIT (3)
+#define REPORTING_MODE_MASK SENSOR_FLAG_MASK(REPORTING_MODE_NBIT, REPORTING_MODE_SHIFT)
+ // 0xE
+
+/*
+ * Mask and shift for data_injection mode sensor flags defined above.
+ */
+#define DATA_INJECTION_SHIFT (4)
+#define DATA_INJECTION_MASK SENSOR_FLAG_MASK_1(DATA_INJECTION_SHIFT) //0x10
+
+/*
+ * Mask and shift for dynamic sensor flag.
+ */
+#define DYNAMIC_SENSOR_SHIFT (5)
+#define DYNAMIC_SENSOR_MASK SENSOR_FLAG_MASK_1(DYNAMIC_SENSOR_SHIFT) //0x20
+
+/*
+ * Mask and shift for sensor additional information support.
+ */
+#define ADDITIONAL_INFO_SHIFT (6)
+#define ADDITIONAL_INFO_MASK SENSOR_FLAG_MASK_1(ADDITIONAL_INFO_SHIFT) //0x40
+
/*
* Availability: SENSORS_DEVICE_API_VERSION_1_3
* Sensor flags used in sensor_t.flags.
@@ -147,20 +176,21 @@
* Counter sensors can be set with this flag and SensorService will inject accelerometer data
* and read the corresponding step counts.
*/
- SENSOR_FLAG_SUPPORTS_DATA_INJECTION = 0x10 // 1 0000
+ SENSOR_FLAG_SUPPORTS_DATA_INJECTION = DATA_INJECTION_MASK, // 1 0000
+
+ /*
+ * Set this flag if the sensor is a dynamically connected sensor. See
+ * dynamic_sensor_meta_event_t and SENSOR_TYPE_DYNAMIC_SENSOR_META for details.
+ */
+ SENSOR_FLAG_DYNAMIC_SENSOR = DYNAMIC_SENSOR_MASK,
+
+ /*
+ * Set this flag if sensor additional information is supported. See SENSOR_TYPE_ADDITIONAL_INFO
+ * and additional_info_event_t for details.
+ */
+ SENSOR_FLAG_ADDITIONAL_INFO = ADDITIONAL_INFO_MASK
};
-/*
- * Mask and shift for reporting mode sensor flags defined above.
- */
-#define REPORTING_MODE_MASK (0xE)
-#define REPORTING_MODE_SHIFT (1)
-
-/*
- * Mask and shift for data_injection mode sensor flags defined above.
- */
-#define DATA_INJECTION_MASK (0x10)
-#define DATA_INJECTION_SHIFT (4)
/*
* Sensor type
diff --git a/include/hardware/sound_trigger.h b/include/hardware/sound_trigger.h
index bfded85..e1abbc9 100644
--- a/include/hardware/sound_trigger.h
+++ b/include/hardware/sound_trigger.h
@@ -39,7 +39,8 @@
#define SOUND_TRIGGER_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0)
-#define SOUND_TRIGGER_DEVICE_API_VERSION_CURRENT SOUND_TRIGGER_DEVICE_API_VERSION_1_0
+#define SOUND_TRIGGER_DEVICE_API_VERSION_1_1 HARDWARE_DEVICE_API_VERSION(1, 1)
+#define SOUND_TRIGGER_DEVICE_API_VERSION_CURRENT SOUND_TRIGGER_DEVICE_API_VERSION_1_1
/**
* List of known sound trigger HAL modules. This is the base name of the sound_trigger HAL
@@ -109,6 +110,7 @@
sound_model_handle_t sound_model_handle);
/* Stop recognition on all models.
+ * Only supported for device api versions SOUND_TRIGGER_DEVICE_API_VERSION_1_1 or above.
* If no implementation is provided, stop_recognition will be called for each running model.
*/
int (*stop_all_recognitions)(const struct sound_trigger_hw_device* dev);
diff --git a/include/hardware/thermal.h b/include/hardware/thermal.h
index 7fdf682..e7189e2 100644
--- a/include/hardware/thermal.h
+++ b/include/hardware/thermal.h
@@ -80,6 +80,13 @@
* If not available, set by HAL to UNKNOWN_TEMPERATURE.
*/
float shutdown_threshold;
+
+ /**
+ * Threshold temperature at which VR mode clockrate minumums cannot be
+ * maintained for this device temperature type.
+ * If not available, set by HAL to UNKNOWN_TEMPERATURE.
+ */
+ float vr_throttling_threshold;
} temperature_t;
typedef struct {
@@ -193,6 +200,7 @@
*/
ssize_t (*getCoolingDevices)(struct thermal_module *module, cooling_device_t *list,
size_t size);
+
} thermal_module_t;
__END_DECLS
diff --git a/modules/soundtrigger/sound_trigger_hw.c b/modules/soundtrigger/sound_trigger_hw.c
index b945b00..0492fd5 100644
--- a/modules/soundtrigger/sound_trigger_hw.c
+++ b/modules/soundtrigger/sound_trigger_hw.c
@@ -819,7 +819,7 @@
stdev->root_model_context = NULL;
stdev->device.common.tag = HARDWARE_DEVICE_TAG;
- stdev->device.common.version = SOUND_TRIGGER_DEVICE_API_VERSION_1_0;
+ stdev->device.common.version = SOUND_TRIGGER_DEVICE_API_VERSION_1_1;
stdev->device.common.module = (struct hw_module_t *) module;
stdev->device.common.close = stdev_close;
stdev->device.get_properties = stdev_get_properties;
diff --git a/modules/thermal/thermal.c b/modules/thermal/thermal.c
index c45d87a..6ba5845 100644
--- a/modules/thermal/thermal.c
+++ b/modules/thermal/thermal.c
@@ -72,6 +72,7 @@
.current_value = temp,
.throttling_threshold = UNKNOWN_TEMPERATURE,
.shutdown_threshold = UNKNOWN_TEMPERATURE,
+ .vr_throttling_threshold = UNKNOWN_TEMPERATURE,
};
}
fclose(file);