review hal_nfc_default

Bug: 196916111
Test: boot to home with nfc hal started
Change-Id: Iee8c30777f83788ff703c8094c03182171d713c5
This commit is contained in:
Adam Shih 2021-09-17 11:06:51 +08:00
parent 9ffc6d62b8
commit 368ac5f679
8 changed files with 14 additions and 22 deletions

View file

@ -134,11 +134,6 @@
# Kernel modules related # Kernel modules related
/vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0 /vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0
# NFC
/(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.2-service\.st u:object_r:hal_nfc_default_exec:s0
/dev/st21nfc u:object_r:nfc_device:s0
/data/nfc(/.*)? u:object_r:nfc_data_file:s0
# Bluetooth # Bluetooth
/(vendor|system/vendor)/bin/hw/android\.hardware\.bluetooth@1\.1-service\.bcmbtlinux u:object_r:hal_bluetooth_btlinux_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.bluetooth@1\.1-service\.bcmbtlinux u:object_r:hal_bluetooth_btlinux_exec:s0
/dev/wbrc u:object_r:wb_coexistence_dev:s0 /dev/wbrc u:object_r:wb_coexistence_dev:s0

View file

@ -3,7 +3,6 @@ vendor_internal_prop(vendor_prop)
vendor_internal_prop(sensors_prop) vendor_internal_prop(sensors_prop)
vendor_internal_prop(vendor_device_prop) vendor_internal_prop(vendor_device_prop)
vendor_internal_prop(vendor_usb_config_prop) vendor_internal_prop(vendor_usb_config_prop)
vendor_internal_prop(vendor_secure_element_prop)
# vendor defaults # vendor defaults
vendor_internal_prop(vendor_config_default_prop) vendor_internal_prop(vendor_config_default_prop)
vendor_internal_prop(vendor_ro_sys_default_prop) vendor_internal_prop(vendor_ro_sys_default_prop)
@ -24,9 +23,6 @@ vendor_internal_prop(vendor_battery_profile_prop)
# Logger # Logger
vendor_internal_prop(vendor_logger_prop) vendor_internal_prop(vendor_logger_prop)
# NFC
vendor_internal_prop(vendor_nfc_prop)
# Touchpanel # Touchpanel
vendor_internal_prop(vendor_touchpanel_prop) vendor_internal_prop(vendor_touchpanel_prop)

View file

@ -37,12 +37,6 @@ vendor.camera.fatp. u:object_r:vendor_camera_fatp_prop:s0
# for gps # for gps
vendor.gps u:object_r:vendor_gps_prop:s0 vendor.gps u:object_r:vendor_gps_prop:s0
# SecureElement
persist.vendor.se. u:object_r:vendor_secure_element_prop:s0
# NFC
persist.vendor.nfc. u:object_r:vendor_nfc_prop:s0
# Battery # Battery
vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0 vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0

View file

@ -14,10 +14,6 @@ userdebug_or_eng(`
set_prop(vendor_init, logpersistd_logging_prop) set_prop(vendor_init, logpersistd_logging_prop)
') ')
# NFC vendor property
set_prop(vendor_init, vendor_nfc_prop)
# SecureElement vendor property
set_prop(vendor_init, vendor_secure_element_prop)
# Battery defender/harness/profile # Battery defender/harness/profile
get_prop(vendor_init, test_harness_prop) get_prop(vendor_init, test_harness_prop)
get_prop(vendor_init, vendor_battery_profile_prop) get_prop(vendor_init, vendor_battery_profile_prop)

View file

@ -15,6 +15,7 @@
/vendor/bin/storageproxyd u:object_r:tee_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0
/vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 /vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0
/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0
/vendor/bin/hw/android\.hardware\.nfc@1\.2-service\.st u:object_r:hal_nfc_default_exec:s0
# Vendor Firmwares # Vendor Firmwares
/vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0
@ -25,6 +26,7 @@
/dev/g2d u:object_r:graphics_device:s0 /dev/g2d u:object_r:graphics_device:s0
/dev/trusty-ipc-dev0 u:object_r:tee_device:s0 /dev/trusty-ipc-dev0 u:object_r:tee_device:s0
/dev/sg1 u:object_r:sg_device:s0 /dev/sg1 u:object_r:sg_device:s0
/dev/st21nfc u:object_r:nfc_device:s0
/dev/st54spi u:object_r:secure_element_device:s0 /dev/st54spi u:object_r:secure_element_device:s0
/dev/st33spi u:object_r:secure_element_device:s0 /dev/st33spi u:object_r:secure_element_device:s0
/dev/ttyGS[0-3] u:object_r:serial_device:s0 /dev/ttyGS[0-3] u:object_r:serial_device:s0
@ -76,6 +78,7 @@
/data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0 /data/vendor/log/rfsd(/.*)? u:object_r:vendor_rfsd_log_file:s0
/data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0
/data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0
/data/nfc(/.*)? u:object_r:nfc_data_file:s0
# Persist # Persist
/mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0 /mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0

View file

@ -7,4 +7,6 @@ vendor_internal_prop(vendor_rild_prop)
vendor_internal_prop(vendor_carrier_prop) vendor_internal_prop(vendor_carrier_prop)
vendor_internal_prop(vendor_ssrdump_prop) vendor_internal_prop(vendor_ssrdump_prop)
vendor_internal_prop(vendor_wifi_version) vendor_internal_prop(vendor_wifi_version)
vendor_internal_prop(vendor_nfc_prop)
vendor_internal_prop(vendor_secure_element_prop)

View file

@ -31,9 +31,15 @@ ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0
persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0 persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0
# SSR Detector # SSR Detector
vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0
# NFC
persist.vendor.nfc. u:object_r:vendor_nfc_prop:s0
# SecureElement
persist.vendor.se. u:object_r:vendor_secure_element_prop:s0
# WiFi # WiFi
vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0 vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0
vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0 vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0