From 50045fa46e434c9e1554409194c03a547c73eead Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Tue, 28 Jan 2020 08:13:36 -0600
Subject: [PATCH] msm8974-common: Transition to consumerir HIDL hal

Change-Id: I85950a46eebec0e9a4b34681b2042467231b33b3
---
 manifest.xml                      | 2 +-
 msm8974.mk                        | 5 ++---
 sepolicy/common/file_contexts     | 1 +
 sepolicy/common/hal_ir_default.te | 2 ++
 sepolicy/common/system_server.te  | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 sepolicy/common/hal_ir_default.te

diff --git a/manifest.xml b/manifest.xml
index 8103baf..4da5205 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -115,7 +115,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.ir</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>IConsumerIr</name>
diff --git a/msm8974.mk b/msm8974.mk
index 3bda121..7f550aa 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -1,5 +1,5 @@
 # Copyright (C) 2012 The CyanogenMod Project
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2020 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -128,8 +128,7 @@ PRODUCT_COPY_FILES += \
 
 # IR Blaster
 PRODUCT_PACKAGES += \
-    android.hardware.ir@1.0-impl \
-    consumerir.msm8974
+    android.hardware.ir@1.0-service.samsung
 
 # Keylayouts
 PRODUCT_COPY_FILES += \
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
index 5a4c887..67c8f19 100644
--- a/sepolicy/common/file_contexts
+++ b/sepolicy/common/file_contexts
@@ -20,6 +20,7 @@
 
 # executeables
 /system/vendor/bin/macloader                            u:object_r:macloader_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.ir@1\.0-service\.samsung                u:object_r:hal_ir_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.sensors@1\.0-service.samsung8974        u:object_r:hal_sensors_default_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service\.samsung-qcom    u:object_r:hal_lineage_livedisplay_sysfs_exec:s0
 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.samsung               u:object_r:hal_lineage_touch_default_exec:s0
diff --git a/sepolicy/common/hal_ir_default.te b/sepolicy/common/hal_ir_default.te
new file mode 100644
index 0000000..0c41eee
--- /dev/null
+++ b/sepolicy/common/hal_ir_default.te
@@ -0,0 +1,2 @@
+allow hal_ir_default sysfs_sec_ir:dir search;
+allow hal_ir_default sysfs_sec_ir:file w_file_perms;
diff --git a/sepolicy/common/system_server.te b/sepolicy/common/system_server.te
index 73ebc56..b8a9ca0 100644
--- a/sepolicy/common/system_server.te
+++ b/sepolicy/common/system_server.te
@@ -9,7 +9,6 @@ allow system_server {
 }:file r_file_perms;
 
 allow system_server {
-    sysfs_sec_ir
     sysfs_sec_led
     sysfs_sec_touchkey
 }:file w_file_perms;