Bladeren bron

sm8450-common: Move to Xiaomi IR AIDL

Change-Id: I46094bcbfaba252b5d98ea8211b927fdaa079e2d
Sebastiano Barezzi 10 maanden geleden
bovenliggende
commit
581d36bcdf
6 gewijzigde bestanden met toevoegingen van 5 en 17 verwijderingen
  1. 1 2
      common.mk
  2. 0 3
      proprietary-files.txt
  3. 1 1
      sepolicy/vendor/device.te
  4. 2 1
      sepolicy/vendor/file_contexts
  5. 1 1
      sepolicy/vendor/hal_ir_default.te
  6. 0 9
      vintf/manifest_xiaomi.xml

+ 1 - 2
common.mk

@@ -272,8 +272,7 @@ PRODUCT_PACKAGES += \
 
 # IR
 PRODUCT_PACKAGES += \
-    [email protected]:64 \
-    [email protected]
+    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

+ 0 - 3
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

+ 1 - 1
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;

+ 2 - 1
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

+ 1 - 1
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;

+ 0 - 9
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>