diff --git a/configs/vintf/device_framework_matrix.xml b/configs/vintf/device_framework_matrix.xml index fb64c13..6d3e5a4 100644 --- a/configs/vintf/device_framework_matrix.xml +++ b/configs/vintf/device_framework_matrix.xml @@ -96,14 +96,6 @@ - android.hardware.ir - 1 - - IConsumerIr - default - - - android.hardware.sensors 2 diff --git a/device.mk b/device.mk index 81ff522..d347a05 100644 --- a/device.mk +++ b/device.mk @@ -243,7 +243,7 @@ PRODUCT_PACKAGES += \ # IR PRODUCT_PACKAGES += \ - android.hardware.ir-service.example + android.hardware.ir-service.xiaomi # IRQ PRODUCT_COPY_FILES += \ diff --git a/fastcharge/vendor.lineage.fastcharge@1.0-service.veux.xml b/fastcharge/vendor.lineage.fastcharge@1.0-service.veux.xml index cc00466..286834c 100644 --- a/fastcharge/vendor.lineage.fastcharge@1.0-service.veux.xml +++ b/fastcharge/vendor.lineage.fastcharge@1.0-service.veux.xml @@ -17,4 +17,4 @@ default - + \ No newline at end of file diff --git a/proprietary-files.txt b/proprietary-files.txt index 8a3ec2c..04e16a9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -555,9 +555,6 @@ vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so -# Consumer IR -vendor/lib64/hw/consumerir.default.so:vendor/lib64/hw/consumerir.holi.so;FIX_SONAME - # Diag system_ext/lib64/libdiag_system.so system_ext/lib64/vendor.qti.diaghal@1.0.so diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index ecf4327..a66841e 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -51,7 +51,8 @@ /vendor/bin/hw/vendor\.dolby\.hardware\.dms@2\.0-service u:object_r:hal_dms_default_exec: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 # Mlipay /(vendor|system/vendor)/bin/mlipayd@1.1 u:object_r:hal_mlipay_default_exec:s0 diff --git a/sepolicy/vendor/hal_ir_default.te b/sepolicy/vendor/hal_ir_default.te index ce503ef..75230af 100644 --- a/sepolicy/vendor/hal_ir_default.te +++ b/sepolicy/vendor/hal_ir_default.te @@ -1,3 +1,3 @@ -type ir_spi_device, dev_type; +type lirc_device, dev_type; -allow hal_ir_default ir_spi_device:chr_file rw_file_perms; +allow hal_ir_default lirc_device:chr_file rw_file_perms;