From 81a354fc8881a0e3b211d968a84596630a685b50 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 21 Oct 2022 12:45:23 +0800 Subject: [PATCH] move brcm gps solution to gs-common Bug: 254758553 Test: google map can locate on pixel Change-Id: I0ffbf5da277d71e04cd3aec1e8ef366b00309a83 --- gps/device.te | 1 - gps/file.te | 6 ------ gps/file_contexts | 12 ------------ gps/genfs_contexts | 3 --- gps/gpsd.te | 21 --------------------- gps/hal_gnss_default.te | 4 ---- gps/lhd.te | 23 ----------------------- gps/scd.te | 17 ----------------- vendor/device.te | 1 + vendor/file.te | 2 ++ vendor/gpsd.te | 7 +++++++ 11 files changed, 10 insertions(+), 87 deletions(-) delete mode 100644 gps/device.te delete mode 100644 gps/file.te delete mode 100644 gps/file_contexts delete mode 100644 gps/genfs_contexts delete mode 100644 gps/gpsd.te delete mode 100644 gps/hal_gnss_default.te delete mode 100644 gps/lhd.te delete mode 100644 gps/scd.te create mode 100644 vendor/gpsd.te diff --git a/gps/device.te b/gps/device.te deleted file mode 100644 index 15d049fa..00000000 --- a/gps/device.te +++ /dev/null @@ -1 +0,0 @@ -type vendor_gnss_device, dev_type; diff --git a/gps/file.te b/gps/file.te deleted file mode 100644 index 4ed25013..00000000 --- a/gps/file.te +++ /dev/null @@ -1,6 +0,0 @@ -type vendor_gps_file, file_type, data_file_type; -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 deleted file mode 100644 index 8ae128e1..00000000 --- a/gps/file_contexts +++ /dev/null @@ -1,12 +0,0 @@ -# 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 -/vendor/bin/hw/gpsd u:object_r:gpsd_exec:s0 -/vendor/bin/hw/android\.hardware\.gnss@[0-9]\.[0-9]-service-brcm u:object_r:hal_gnss_default_exec:s0 diff --git a/gps/genfs_contexts b/gps/genfs_contexts deleted file mode 100644 index 8d81506b..00000000 --- a/gps/genfs_contexts +++ /dev/null @@ -1,3 +0,0 @@ -# GPS -genfscon sysfs /devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby u:object_r:sysfs_gps:s0 - diff --git a/gps/gpsd.te b/gps/gpsd.te deleted file mode 100644 index 9757395b..00000000 --- a/gps/gpsd.te +++ /dev/null @@ -1,21 +0,0 @@ -type gpsd, domain; -type gpsd_exec, vendor_file_type, exec_type, file_type; -init_daemon_domain(gpsd) - -# Allow gpsd access PixelLogger unix socket in debug build only -userdebug_or_eng(` - typeattribute gpsd mlstrustedsubject; - allow gpsd logger_app:unix_stream_socket connectto; -') - -# Allow gpsd to obtain wakelock -wakelock_use(gpsd) - -# Allow gpsd access data vendor gps files -allow gpsd vendor_gps_file:dir create_dir_perms; -allow gpsd vendor_gps_file:file create_file_perms; -allow gpsd vendor_gps_file:fifo_file create_file_perms; - -# Allow gpsd to access sensor service -binder_call(gpsd, system_server); -allow gpsd fwk_sensor_hwservice:hwservice_manager find; diff --git a/gps/hal_gnss_default.te b/gps/hal_gnss_default.te deleted file mode 100644 index e3004237..00000000 --- a/gps/hal_gnss_default.te +++ /dev/null @@ -1,4 +0,0 @@ -# Allow hal_gnss_default access data vendor gps files -allow hal_gnss_default vendor_gps_file:dir create_dir_perms; -allow hal_gnss_default vendor_gps_file:file create_file_perms; -allow hal_gnss_default vendor_gps_file:fifo_file create_file_perms; diff --git a/gps/lhd.te b/gps/lhd.te deleted file mode 100644 index e980897c..00000000 --- a/gps/lhd.te +++ /dev/null @@ -1,23 +0,0 @@ -type lhd, domain; -type lhd_exec, vendor_file_type, exec_type, file_type; -init_daemon_domain(lhd) - -# Allow lhd access PixelLogger unix socket in debug build only -userdebug_or_eng(` - typeattribute lhd mlstrustedsubject; - allow lhd logger_app:unix_stream_socket connectto; -') - -# Allow lhd access data vendor gps files -allow lhd vendor_gps_file:dir create_dir_perms; -allow lhd vendor_gps_file:file create_file_perms; -allow lhd vendor_gps_file:fifo_file create_file_perms; - -# Allow lhd to obtain wakelock -wakelock_use(lhd) - -# Allow lhd access /dev/bbd_control file -allow lhd vendor_gnss_device:chr_file rw_file_perms; - -# Allow lhd access nstandby gpio -allow lhd sysfs_gps:file rw_file_perms; diff --git a/gps/scd.te b/gps/scd.te deleted file mode 100644 index 28aaee0a..00000000 --- a/gps/scd.te +++ /dev/null @@ -1,17 +0,0 @@ -type scd, domain; -type scd_exec, vendor_file_type, exec_type, file_type; -init_daemon_domain(scd) - -# Allow scd access PixelLogger unix socket in debug build only -userdebug_or_eng(` - typeattribute scd mlstrustedsubject; - allow scd logger_app:unix_stream_socket connectto; -') - -# Allow a base set of permissions required for network access. -net_domain(scd); - -# Allow scd access data vendor gps files -allow scd vendor_gps_file:dir create_dir_perms; -allow scd vendor_gps_file:file create_file_perms; -allow scd vendor_gps_file:fifo_file create_file_perms; diff --git a/vendor/device.te b/vendor/device.te index 7fd0e359..1e86c925 100644 --- a/vendor/device.te +++ b/vendor/device.te @@ -1 +1,2 @@ type modem_block_device, dev_type; +type vendor_gnss_device, dev_type; diff --git a/vendor/file.te b/vendor/file.te index 572e093e..3b923eb6 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -1,10 +1,12 @@ # Data +type vendor_gps_file, file_type, data_file_type; type modem_stat_data_file, file_type, data_file_type; type vendor_log_file, file_type, data_file_type; type vendor_rfsd_log_file, file_type, data_file_type; type vendor_slog_file, file_type, data_file_type; type radio_vendor_data_file, file_type, data_file_type; userdebug_or_eng(` + typeattribute vendor_gps_file mlstrustedobject; typeattribute radio_vendor_data_file mlstrustedobject; typeattribute vendor_slog_file mlstrustedobject; ') diff --git a/vendor/gpsd.te b/vendor/gpsd.te new file mode 100644 index 00000000..79bf4ca7 --- /dev/null +++ b/vendor/gpsd.te @@ -0,0 +1,7 @@ +type gpsd, domain; +type gpsd_exec, vendor_file_type, exec_type, file_type; +# Allow gpsd access PixelLogger unix socket in debug build only +userdebug_or_eng(` + typeattribute gpsd mlstrustedsubject; + allow gpsd logger_app:unix_stream_socket connectto; +')