From a1e2240d59c5ba39da415fa9b5f0c8c3c785d026 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <seba@sebaubuntu.dev>
Date: Sun, 18 Aug 2024 23:59:08 +0200
Subject: [PATCH] sm8450-common: Move to Xiaomi IR AIDL

Change-Id: I46094bcbfaba252b5d98ea8211b927fdaa079e2d
---
 common.mk                         | 3 +--
 proprietary-files.txt             | 3 ---
 sepolicy/vendor/device.te         | 2 +-
 sepolicy/vendor/file_contexts     | 3 ++-
 sepolicy/vendor/hal_ir_default.te | 2 +-
 vintf/manifest_xiaomi.xml         | 9 ---------
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/common.mk b/common.mk
index 7dd6d90..63c091e 100644
--- a/common.mk
+++ b/common.mk
@@ -272,8 +272,7 @@ PRODUCT_PACKAGES += \
 
 # IR
 PRODUCT_PACKAGES += \
-    android.hardware.ir@1.0-impl:64 \
-    android.hardware.ir@1.0-service
+    android.hardware.ir-service.xiaomi
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b331b65..035c28e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -408,9 +408,6 @@ vendor/lib64/libqtiidentitycredential.so
 # IPA firmware
 vendor/etc/init/ipa_fws.rc
 
-# IR
-vendor/lib64/hw/consumerir.qcom.so
-
 # IRQ balance
 vendor/bin/msm_irqbalance
 vendor/etc/msm_irqbalance.conf
diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te
index 06520bc..ffc184f 100644
--- a/sepolicy/vendor/device.te
+++ b/sepolicy/vendor/device.te
@@ -11,7 +11,7 @@ type vendor_displayfeature_device, dev_type;
 type vendor_fingerprint_device, dev_type;
 
 # IR
-type ir_spi_device, dev_type;
+type lirc_device, dev_type;
 
 # Modem
 type vendor_radio_smd_device, dev_type;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 322775e..bf7c0b9 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -56,7 +56,8 @@
 /mnt/vendor/persist/qxwz u:object_r:qx_oss_vendor_data_file:s0
 
 # IR
-/dev/ir_spi u:object_r:ir_spi_device:s0
+/dev/lirc[0-9]+ u:object_r:lirc_device:s0
+/vendor/bin/hw/android\.hardware\.ir-service\.xiaomi u:object_r:hal_ir_default_exec:s0
 
 # Mac Address
 /data/vendor/mac_addr(/.*)? u:object_r:vendor_mac_vendor_data_file:s0
diff --git a/sepolicy/vendor/hal_ir_default.te b/sepolicy/vendor/hal_ir_default.te
index 46663b7..825e1e2 100644
--- a/sepolicy/vendor/hal_ir_default.te
+++ b/sepolicy/vendor/hal_ir_default.te
@@ -1 +1 @@
-allow hal_ir_default ir_spi_device:chr_file rw_file_perms;
+allow hal_ir_default lirc_device:chr_file rw_file_perms;
diff --git a/vintf/manifest_xiaomi.xml b/vintf/manifest_xiaomi.xml
index a0d332a..cec7010 100644
--- a/vintf/manifest_xiaomi.xml
+++ b/vintf/manifest_xiaomi.xml
@@ -3,15 +3,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest version="1.0" type="device">
-     <hal format="hidl">
-        <name>android.hardware.ir</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IConsumerIr</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>com.fingerprints.extension</name>
         <transport>hwbinder</transport>