commit dc1f7cbb0c533e19ccb17480a130e708251df057
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 18 21:27:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 18 21:27:45 2020 +0000
tree 2118fb491b75c9d0c9294d8f897183cce8793d40
parent c4bffae92c86aaaa422f4d480a31317f3df9e4e0
parent e69b46dc9d7177ca4383cbd428c60fdaca57f704

Merge "Add a soong namespace in device/generic/goldfish" am: e69b46dc9d

Change-Id: I6e384abaa458eec22f8ff237841bb85ed5a99fd4

input-mt/virtio_input_multi_touch_2.idc

diff --git a/input-mt/virtio_input_multi_touch_2.idc b/input-mt/virtio_input_multi_touch_2.idc
index 8e1b02a..548d5b0 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:8140900251843329
+touch.displayId = local:1

input-mt/virtio_input_multi_touch_3.idc

diff --git a/input-mt/virtio_input_multi_touch_3.idc b/input-mt/virtio_input_multi_touch_3.idc
index 6a11240..d255d5f 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:8140940453066754
+touch.displayId = local:2

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index f3b24ab..4c45448 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -89,7 +89,7 @@
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
-        <version>2.3</version>
+        <version>2.1</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>

vendor.mk

diff --git a/vendor.mk b/vendor.mk
index 9fc0bdc..f99686e 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -41,8 +41,8 @@
     audio.primary.goldfish \
     stagefright \
     fingerprint.ranchu \
-    android.hardware.graphics.composer@2.3-impl \
-    android.hardware.graphics.composer@2.3-service \
+    android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.allocator@3.0-service \
     android.hardware.graphics.mapper@3.0-impl-ranchu \
     hwcomposer.ranchu \