From 360e974c5e6a2a8bb9b82fca83f1d43b735ebba0 Mon Sep 17 00:00:00 2001
From: Cody Heiner <codyheiner@google.com>
Date: Fri, 31 Mar 2023 15:36:28 -0700
Subject: [PATCH 1/2] Update ITouchContextService version

Test: build succeeds on all devices.
Test: failing tests from b/271227149 pass.

Bug: 271227149
Change-Id: I7a086e821267dd7f2b003faeae9c091993997434
---
 device_framework_matrix_product.xml | 1 +
 manifest.xml                        | 1 +
 manifest_64.xml                     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index f07987dc..58fd38d2 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -94,6 +94,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>
diff --git a/manifest.xml b/manifest.xml
index 18b39116..038a3d48 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -47,6 +47,7 @@
     </hal>
     <hal format="aidl">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>
diff --git a/manifest_64.xml b/manifest_64.xml
index 3724ed7a..122d1bb3 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -39,6 +39,7 @@
     </hal>
     <hal format="aidl">
         <name>com.google.input</name>
+        <version>2</version>
         <interface>
             <name>ITouchContextService</name>
             <instance>default</instance>

From e6a9d4893289aeb57300417ce285974581aabe09 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ianelliott@google.com>
Date: Tue, 4 Apr 2023 01:46:28 +0000
Subject: [PATCH 2/2] Revert "gs101: Use SkiaVk as RenderEngine backend"

This reverts commit 65460483f6515eb58e3da6b61d6071a3d75d5378.

Reason for revert: Blocking HWASAN testing on Oriole (see b/274419744)

Change-Id: I60b1a9a89b119335fc793a1e01c382d84afe9cae
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index bd3af93f..5d17eb17 100644
--- a/device.mk
+++ b/device.mk
@@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiavkthreaded
+	debug.renderengine.backend=skiaglthreaded
 
 # GRAPHICS - GPU (end)
 # ####################