From 99ab56746a3dd3fbadce4be53d2d2dba4a084b41 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 27 Aug 2021 11:29:09 +0800 Subject: [PATCH] modularize lhd Bug: 197914244 Test: boot with lhd started Change-Id: I873a151e4dc6e512b8831b936c3e057ae544888c --- gps/device.te | 1 + gps/file.te | 1 + gps/file_contexts | 6 ++++++ gps/genfs_contexts | 3 +++ {legacy => gps}/lhd.te | 0 legacy/device.te | 1 - legacy/file.te | 3 --- legacy/file_contexts | 4 ---- legacy/genfs_contexts | 3 --- 9 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 gps/device.te create mode 100644 gps/genfs_contexts rename {legacy => gps}/lhd.te (100%) diff --git a/gps/device.te b/gps/device.te new file mode 100644 index 00000000..15d049fa --- /dev/null +++ b/gps/device.te @@ -0,0 +1 @@ +type vendor_gnss_device, dev_type; diff --git a/gps/file.te b/gps/file.te index c7a29a24..4ed25013 100644 --- a/gps/file.te +++ b/gps/file.te @@ -3,3 +3,4 @@ userdebug_or_eng(` typeattribute vendor_gps_file mlstrustedobject; ') +type sysfs_gps, sysfs_type, fs_type; diff --git a/gps/file_contexts b/gps/file_contexts index b39c2d40..cb6f452a 100644 --- a/gps/file_contexts +++ b/gps/file_contexts @@ -1,4 +1,10 @@ # gnss/gps data/log files /data/vendor/gps(/.*)? u:object_r:vendor_gps_file:s0 + +# devices +/dev/bbd_control u:object_r:vendor_gnss_device:s0 +/dev/ttyBCM u:object_r:vendor_gnss_device:s0 + # vendor binaries /vendor/bin/hw/scd u:object_r:scd_exec:s0 +/vendor/bin/hw/lhd u:object_r:lhd_exec:s0 diff --git a/gps/genfs_contexts b/gps/genfs_contexts new file mode 100644 index 00000000..1eab75b1 --- /dev/null +++ b/gps/genfs_contexts @@ -0,0 +1,3 @@ +# GPS +genfscon sysfs /devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby u:object_r:sysfs_gps:s0 + diff --git a/legacy/lhd.te b/gps/lhd.te similarity index 100% rename from legacy/lhd.te rename to gps/lhd.te diff --git a/legacy/device.te b/legacy/device.te index a3af95f8..5d640eab 100644 --- a/legacy/device.te +++ b/legacy/device.te @@ -9,7 +9,6 @@ type sda_block_device, dev_type; # Exynos devices type vendor_m2m1shot_device, dev_type; -type vendor_gnss_device, dev_type; type vendor_nanohub_device, dev_type; type vendor_secmem_device, dev_type; type vendor_toe_device, dev_type; diff --git a/legacy/file.te b/legacy/file.te index 87cdc95a..3a19a94a 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -104,9 +104,6 @@ type persist_camera_file, file_type; type vendor_camera_tuning_file, vendor_file_type, file_type; type vendor_camera_data_file, file_type, data_file_type; -# GPS -type sysfs_gps, sysfs_type, fs_type; - # Display type sysfs_display, sysfs_type, fs_type; type persist_display_file, file_type, vendor_persist_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index 033f9d3b..aaec82de 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -77,10 +77,7 @@ # # Exynos Devices # -/dev/gnss_ipc u:object_r:vendor_gnss_device:s0 -/dev/bbd_control u:object_r:vendor_gnss_device:s0 /dev/bbd_pwrstat u:object_r:power_stats_device:s0 -/dev/ttyBCM u:object_r:vendor_gnss_device:s0 /dev/nanohub u:object_r:vendor_nanohub_device:s0 /dev/nanohub_comms u:object_r:vendor_nanohub_device:s0 /dev/m2m1shot_scaler0 u:object_r:vendor_m2m1shot_device:s0 @@ -115,7 +112,6 @@ # /(vendor|system/vendor)/bin/cbd u:object_r:cbd_exec:s0 /(vendor|system/vendor)/bin/hw/gpsd u:object_r:gpsd_exec:s0 -/(vendor|system/vendor)/bin/hw/lhd u:object_r:lhd_exec:s0 /(vendor|system/vendor)/bin/hw/rild_exynos u:object_r:rild_exec:s0 /(vendor|system/vendor)/bin/rfsd u:object_r:rfsd_exec:s0 /(vendor|system/vendor)/bin/bipchmgr u:object_r:bipchmgr_exec:s0 diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts index 1991004c..4976f731 100644 --- a/legacy/genfs_contexts +++ b/legacy/genfs_contexts @@ -102,9 +102,6 @@ genfscon proc /fts/driver_test genfscon proc /fts_ext/driver_test u:object_r:proc_touch:s0 genfscon sysfs /devices/virtual/sec/tsp u:object_r:sysfs_touch:s0 -# GPS -genfscon sysfs /devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby u:object_r:sysfs_gps:s0 - # Display genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/gamma u:object_r:sysfs_display:s0 genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/gamma u:object_r:sysfs_display:s0