Upgrade HWC from 2.1 to 2.3
sync with EmuHWC2 to support HWC 2.3, required by multi physical display
emulation.
Bug: 142075281
Test: manual
Change-Id: I043ea68880568be5b33487763227a9a38ea82835
diff --git a/input-mt/virtio_input_multi_touch_2.idc b/input-mt/virtio_input_multi_touch_2.idc
index 548d5b0..8e1b02a 100644
--- a/input-mt/virtio_input_multi_touch_2.idc
+++ b/input-mt/virtio_input_multi_touch_2.idc
@@ -9,4 +9,4 @@
# This displayID matches the unique ID of the virtual display created for Emulator.
# This will indicate to input flinger than it should link this input device
# with the virtual display.
-touch.displayId = local:1
+touch.displayId = local:8140900251843329
diff --git a/input-mt/virtio_input_multi_touch_3.idc b/input-mt/virtio_input_multi_touch_3.idc
index d255d5f..6a11240 100644
--- a/input-mt/virtio_input_multi_touch_3.idc
+++ b/input-mt/virtio_input_multi_touch_3.idc
@@ -9,4 +9,4 @@
# This displayID matches the unique ID of the virtual display created for Emulator.
# This will indicate to input flinger than it should link this input device
# with the virtual display.
-touch.displayId = local:2
+touch.displayId = local:8140940453066754
diff --git a/manifest-arm.xml b/manifest-arm.xml
index e963553..c9bcbaa 100644
--- a/manifest-arm.xml
+++ b/manifest-arm.xml
@@ -82,7 +82,7 @@
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
- <version>2.1</version>
+ <version>2.3</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 8ca268a..5be1a35 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -82,7 +82,7 @@
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
- <version>2.1</version>
+ <version>2.3</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
diff --git a/vendor.mk b/vendor.mk
index 6a73de4..712a505 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -74,8 +74,8 @@
power.ranchu \
fingerprint.ranchu \
sensors.ranchu \
- android.hardware.graphics.composer@2.1-impl \
- android.hardware.graphics.composer@2.1-service \
+ android.hardware.graphics.composer@2.3-impl \
+ android.hardware.graphics.composer@2.3-service \
android.hardware.graphics.allocator@2.0-service \
android.hardware.graphics.allocator@2.0-impl \
android.hardware.graphics.mapper@2.0-impl \
