diff --git a/legacy/device.te b/legacy/device.te index 182fe4d5..b24e400f 100644 --- a/legacy/device.te +++ b/legacy/device.te @@ -7,9 +7,6 @@ type wb_coexistence_dev, dev_type; # Touch type touch_offload_device, dev_type; -# LWIS (Lightweight Imaging Subsystem) devices, used by Lyric camera HAL -type lwis_device, dev_type; - # RLS device type rls_device, dev_type; diff --git a/legacy/file.te b/legacy/file.te index 1f73ec66..d2314ba2 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -28,11 +28,6 @@ type vendor_battery_debugfs, fs_type, debugfs_type; type sysfs_exynos_bts, sysfs_type, fs_type; type sysfs_exynos_bts_stats, sysfs_type, fs_type; -# Vendor tools -type vendor_usf_stats, vendor_file_type, file_type; -type vendor_usf_reg_edit, vendor_file_type, file_type; -type vendor_dumpsys, vendor_file_type, file_type; - # Sensors type nanohub_lock_file, file_type, data_file_type; type sensor_vendor_data_file, file_type, data_file_type, mlstrustedobject; diff --git a/legacy/file_contexts b/legacy/file_contexts index b771c8d9..0cfd17a2 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -1,13 +1,3 @@ -# -# Exynos HAL -# -/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.0-service32 u:object_r:hal_usb_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.samsung_slsi\.hardware\.configstore@1\.0-service u:object_r:hal_configstore_default_exec:s0 - -/vendor/bin/usf_stats u:object_r:vendor_usf_stats:s0 -/vendor/bin/usf_reg_edit u:object_r:vendor_usf_reg_edit:s0 -/vendor/bin/dumpsys u:object_r:vendor_dumpsys:s0 - # # HALs # @@ -51,55 +41,6 @@ /dev/stmvl53l1_ranging u:object_r:rls_device:s0 -/dev/lwis-act0 u:object_r:lwis_device:s0 -/dev/lwis-act1 u:object_r:lwis_device:s0 -/dev/lwis-act-ak7377 u:object_r:lwis_device:s0 -/dev/lwis-act-lc898129 u:object_r:lwis_device:s0 -/dev/lwis-act-sem1215sa u:object_r:lwis_device:s0 -/dev/lwis-csi u:object_r:lwis_device:s0 -/dev/lwis-dpm u:object_r:lwis_device:s0 -/dev/lwis-eeprom0 u:object_r:lwis_device:s0 -/dev/lwis-eeprom1 u:object_r:lwis_device:s0 -/dev/lwis-eeprom2 u:object_r:lwis_device:s0 -/dev/lwis-eeprom-lc898128 u:object_r:lwis_device:s0 -/dev/lwis-eeprom-lc898129 u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64s u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64s-imx355-inner u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64s-imx355-outer u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64x u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64x-imx386 u:object_r:lwis_device:s0 -/dev/lwis-eeprom-m24c64x-imx663 u:object_r:lwis_device:s0 -/dev/lwis-eeprom-sem1215sa u:object_r:lwis_device:s0 -/dev/lwis-flash0 u:object_r:lwis_device:s0 -/dev/lwis-flash-lm3644 u:object_r:lwis_device:s0 -/dev/lwis-g3aa u:object_r:lwis_device:s0 -/dev/lwis-gdc0 u:object_r:lwis_device:s0 -/dev/lwis-gdc1 u:object_r:lwis_device:s0 -/dev/lwis-gtnr-align u:object_r:lwis_device:s0 -/dev/lwis-gtnr-merge u:object_r:lwis_device:s0 -/dev/lwis-ipp u:object_r:lwis_device:s0 -/dev/lwis-itp u:object_r:lwis_device:s0 -/dev/lwis-mcsc u:object_r:lwis_device:s0 -/dev/lwis-ois-lc898128 u:object_r:lwis_device:s0 -/dev/lwis-ois-lc898129 u:object_r:lwis_device:s0 -/dev/lwis-ois-sem1215sa u:object_r:lwis_device:s0 -/dev/lwis-pdp u:object_r:lwis_device:s0 -/dev/lwis-scsc u:object_r:lwis_device:s0 -/dev/lwis-sensor0 u:object_r:lwis_device:s0 -/dev/lwis-sensor1 u:object_r:lwis_device:s0 -/dev/lwis-sensor2 u:object_r:lwis_device:s0 -/dev/lwis-sensor-gn1 u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx355 u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx355-inner u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx355-outer u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx363 u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx386 u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx586 u:object_r:lwis_device:s0 -/dev/lwis-sensor-imx663 u:object_r:lwis_device:s0 -/dev/lwis-slc u:object_r:lwis_device:s0 -/dev/lwis-top u:object_r:lwis_device:s0 -/dev/lwis-votf u:object_r:lwis_device:s0 - # VIDEO /data/vendor/media(/.*)? u:object_r:vendor_media_data_file:s0 diff --git a/whitechapel_pro/device.te b/whitechapel_pro/device.te index 30753c77..bb45e299 100644 --- a/whitechapel_pro/device.te +++ b/whitechapel_pro/device.te @@ -7,4 +7,5 @@ type efs_block_device, dev_type, bdev_type; type modem_userdata_block_device, dev_type, bdev_type; type sg_device, dev_type; type vendor_toe_device, dev_type; +type lwis_device, dev_type; diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index 5904ff5d..e47d521b 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -38,6 +38,11 @@ type persist_battery_file, file_type, vendor_persist_type; # CHRE type chre_socket, file_type; +# Vendor tools +type vendor_usf_stats, vendor_file_type, file_type; +type vendor_usf_reg_edit, vendor_file_type, file_type; +type vendor_dumpsys, vendor_file_type, file_type; + # Modem type modem_efs_file, file_type; type modem_userdata_file, file_type; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 2d35785e..34cfef97 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -15,6 +15,9 @@ /vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0 /vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 /vendor/bin/convert_to_f2fs\.sh u:object_r:convert-to-f2fs-sh_exec:s0 +/vendor/bin/usf_stats u:object_r:vendor_usf_stats:s0 +/vendor/bin/usf_reg_edit u:object_r:vendor_usf_reg_edit:s0 +/vendor/bin/dumpsys u:object_r:vendor_dumpsys:s0 /vendor/bin/hw/samsung\.hardware\.media\.c2@1\.0-service u:object_r:mediacodec_samsung_exec:s0 /vendor/bin/hw/google\.hardware\.media\.c2@1\.0-service u:object_r:mediacodec_google_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-service-gto u:object_r:hal_secure_element_gto_exec:s0 @@ -32,6 +35,37 @@ /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 # Devices +/dev/lwis-act-ak7377 u:object_r:lwis_device:s0 +/dev/lwis-act-ak7377-imx386 u:object_r:lwis_device:s0 +/dev/lwis-act-sem1215sa u:object_r:lwis_device:s0 +/dev/lwis-csi u:object_r:lwis_device:s0 +/dev/lwis-dpm u:object_r:lwis_device:s0 +/dev/lwis-eeprom-lc898128 u:object_r:lwis_device:s0 +/dev/lwis-eeprom-m24c64x-imx386 u:object_r:lwis_device:s0 +/dev/lwis-eeprom-m24c64x-imx663 u:object_r:lwis_device:s0 +/dev/lwis-eeprom-sem1215sa u:object_r:lwis_device:s0 +/dev/lwis-flash-lm3644 u:object_r:lwis_device:s0 +/dev/lwis-g3aa u:object_r:lwis_device:s0 +/dev/lwis-gdc0 u:object_r:lwis_device:s0 +/dev/lwis-gdc1 u:object_r:lwis_device:s0 +/dev/lwis-gtnr-align u:object_r:lwis_device:s0 +/dev/lwis-gtnr-merge u:object_r:lwis_device:s0 +/dev/lwis-ipp u:object_r:lwis_device:s0 +/dev/lwis-itp u:object_r:lwis_device:s0 +/dev/lwis-mcsc u:object_r:lwis_device:s0 +/dev/lwis-ois-lc898128 u:object_r:lwis_device:s0 +/dev/lwis-ois-sem1215sa u:object_r:lwis_device:s0 +/dev/lwis-pdp u:object_r:lwis_device:s0 +/dev/lwis-scsc u:object_r:lwis_device:s0 +/dev/lwis-sensor-3j1 u:object_r:lwis_device:s0 +/dev/lwis-sensor-gm5 u:object_r:lwis_device:s0 +/dev/lwis-sensor-gn1 u:object_r:lwis_device:s0 +/dev/lwis-sensor-imx386 u:object_r:lwis_device:s0 +/dev/lwis-sensor-imx586 u:object_r:lwis_device:s0 +/dev/lwis-sensor-imx663 u:object_r:lwis_device:s0 +/dev/lwis-slc u:object_r:lwis_device:s0 +/dev/lwis-top u:object_r:lwis_device:s0 +/dev/lwis-votf u:object_r:lwis_device:s0 /dev/dri/card0 u:object_r:graphics_device:s0 /dev/fimg2d u:object_r:graphics_device:s0 /dev/g2d u:object_r:graphics_device:s0