Merge "Merge tag 'android-6.0.0_r26' into HEAD"
diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index ca7b18b..cce4d94 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -28,6 +28,9 @@
#include <hardware/hardware.h>
#include <system/audio.h>
#include <hardware/audio_effect.h>
+#ifdef AUDIO_LISTEN_ENABLED
+#include <listen_types.h>
+#endif
__BEGIN_DECLS
@@ -652,6 +655,28 @@
int (*set_audio_port_config)(struct audio_hw_device *dev,
const struct audio_port_config *config);
+#ifdef AUDIO_LISTEN_ENABLED
+ /** This method creates the listen session and returns handle */
+ int (*open_listen_session)(struct audio_hw_device *dev,
+ listen_open_params_t *params,
+ struct listen_session** handle);
+
+ /** This method closes the listen session */
+ int (*close_listen_session)(struct audio_hw_device *dev,
+ struct listen_session* handle);
+
+ /** This method sets the mad observer callback */
+ int (*set_mad_observer)(struct audio_hw_device *dev,
+ listen_callback_t cb_func);
+
+ /**
+ * This method is used for setting listen hal specfic parameters.
+ * If multiple paramets are set in one call and setting any one of them
+ * fails it will return failure.
+ */
+ int (*listen_set_parameters)(struct audio_hw_device *dev,
+ const char *kv_pairs);
+#endif
};
typedef struct audio_hw_device audio_hw_device_t;
diff --git a/include/hardware/power.h b/include/hardware/power.h
index 10612f3..8825325 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -46,7 +46,8 @@
*/
POWER_HINT_VIDEO_ENCODE = 0x00000003,
POWER_HINT_VIDEO_DECODE = 0x00000004,
- POWER_HINT_LOW_POWER = 0x00000005
+ POWER_HINT_LOW_POWER = 0x00000005,
+ POWER_HINT_CAM_PREVIEW = 0x00000006
} power_hint_t;
typedef enum {
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index b368ee6..3f45fb9 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -147,7 +147,7 @@
* 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 = 0x8 // 1000
+ SENSOR_FLAG_SUPPORTS_DATA_INJECTION = 0x10 // 1000
};
/*