Merge TP1A.220126.001
Change-Id: I5e79d1a8fdf632e13679a99baf9f106d6c662f87
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 95a0b6e..431c71a 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -27,7 +27,16 @@
__BEGIN_DECLS
+/**
+* The Bluetooth Hardware Module ID
+*/
+
#define BLUETOOTH_INTERFACE_STRING "bluetoothInterface"
+#define BT_HARDWARE_MODULE_ID "bluetooth"
+#define BT_STACK_MODULE_ID "bluetooth"
+#define BT_STACK_TEST_MODULE_ID "bluetooth_test"
+#define bluetooth_module_t "bluetooth_test"
+
/** Bluetooth profile interface IDs */
diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h
index 16651a9..75632de 100644
--- a/include/hardware/camera_common.h
+++ b/include/hardware/camera_common.h
@@ -1209,8 +1209,34 @@
*/
void (*notify_device_state_change)(uint64_t deviceState);
+ /**
+ * get_camera_device_version:
+ *
+ * Return the device version for a given camera device. This value may not change for a camera
+ * device. The version returned here must be the same as the one from get_camera_info.
+ *
+ * Return values:
+ *
+ * 0: On a successful operation
+ *
+ * -ENODEV: The information cannot be provided due to an internal
+ * error.
+ *
+ * -EINVAL: The input arguments are invalid, i.e. the id is invalid,
+ * and/or the module is invalid.
+ *
+ * Version information (based on camera_module_t.common.module_api_version):
+ *
+ * CAMERA_MODULE_API_VERSION_2_5 or higher:
+ *
+ * When a camera is disconnected, its camera id becomes invalid. Calling this
+ * this method with this invalid camera id will get -EINVAL and NULL camera
+ * static metadata (camera_info.static_camera_characteristics).
+ */
+ int (*get_camera_device_version)(int camera_id, uint32_t *version);
+
/* reserved for future use */
- void* reserved[2];
+ void* reserved[1];
} camera_module_t;
__END_DECLS
diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h
index 3823765..c4d8a44 100644
--- a/include/hardware/hwcomposer_defs.h
+++ b/include/hardware/hwcomposer_defs.h
@@ -299,10 +299,19 @@
enum {
HWC_DISPLAY_PRIMARY = 0,
HWC_DISPLAY_EXTERNAL = 1, // HDMI, DP, etc.
- HWC_DISPLAY_VIRTUAL = 2,
- HWC_NUM_PHYSICAL_DISPLAY_TYPES = 2,
- HWC_NUM_DISPLAY_TYPES = 3,
+ HWC_DISPLAY_EXTERNAL_2 = 2,
+ HWC_DISPLAY_EXTERNAL_3 = 3,
+ HWC_DISPLAY_EXTERNAL_4 = 4,
+
+ HWC_DISPLAY_BUILTIN_2 = 5,
+ HWC_DISPLAY_BUILTIN_3 = 6,
+ HWC_DISPLAY_BUILTIN_4 = 7,
+
+ HWC_DISPLAY_VIRTUAL = 8,
+
+ HWC_NUM_PHYSICAL_DISPLAY_TYPES = 8,
+ HWC_NUM_DISPLAY_TYPES = 9,
};
enum {