Merge QP1A.190418.001
Change-Id: If36ad40cb0e0b7dc4e59263f380712f9c29b5f3e
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 40ccc60..3bcbeed 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/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h
index fd373e3..9f22f86 100644
--- a/include/hardware/hwcomposer_defs.h
+++ b/include/hardware/hwcomposer_defs.h
@@ -261,10 +261,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 {