From dad592c05571d3d855b7c888a58aa13a1b23079e Mon Sep 17 00:00:00 2001
From: DJABhipHop <djabhiphop-DJABHipHop@yahoo.com>
Date: Tue, 2 Feb 2021 08:33:07 -0500
Subject: [PATCH] Revert "matissewifi: nuke IR"

This reverts commit d66ed399be7c352d54912e097483775114f05e86.

Conflicts:
	device.mk
---
 BoardConfig.mk |  3 +++
 device.mk      |  8 ++++++++
 manifest.xml   | 11 +++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 manifest.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 791a811..b465cb5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,5 +22,8 @@ TARGET_OTA_ASSERT_DEVICE := matissewifi
 # Kernel
 TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
 
+# HIDL
+DEVICE_MANIFEST_FILE += device/samsung/matissewifi/manifest.xml
+
 # inherit from the proprietary version
 -include vendor/samsung/matissewifi/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 83d0ab1..45c2dcc 100644
--- a/device.mk
+++ b/device.mk
@@ -24,6 +24,14 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
+# Permissions
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
+
+# IR Blaster
+PRODUCT_PACKAGES += \
+    android.hardware.ir@1.0-service.samsung
+
 # Get non-open-source specific aspects
 $(call inherit-product-if-exists, vendor/samsung/matissewifi/matissewifi-vendor.mk)
 
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..ab040c3
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,11 @@
+<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>   
+</manifest>