From 26ced05f4377a00ea63278e63098b9b127886709 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 25 Apr 2025 17:36:15 +0100
Subject: [PATCH] dre: Switch to Touch AIDL

Change-Id: I92a19fedb9ea482616c2e3d550e30b69d2a3a5c7
---
 BoardConfig.mk   |  1 -
 device.mk        |  2 +-
 manifest_odm.xml | 15 ---------------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 manifest_odm.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e48e98b..88ca7c2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -81,7 +81,6 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
-ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml
 
 # Kernel
 BOARD_BOOT_HEADER_VERSION := 3
diff --git a/device.mk b/device.mk
index 45bd517..3997ec5 100644
--- a/device.mk
+++ b/device.mk
@@ -348,7 +348,7 @@ PRODUCT_PACKAGES += \
 
 # Touch
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.oplus
+    vendor.lineage.touch-service.oplus
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
diff --git a/manifest_odm.xml b/manifest_odm.xml
deleted file mode 100644
index 928a70b..0000000
--- a/manifest_odm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>vendor.lineage.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IHighTouchPollingRate</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>ITouchscreenGesture</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>