summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-01 03:57:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-12-01 03:57:28 +0000
commit421b5abf9715743b586716ee8155b1afba5e350d (patch)
tree808e36b97d5ffa4b08e9578c55f0c04198acd2bd
parent124e7aa6395655f4bb9b030c3bfa1a9740757f70 (diff)
parent23feade4db0884aadcd2a3924cdd07cf3799cd0d (diff)
downloadzuma-sepolicy-421b5abf9715743b586716ee8155b1afba5e350d.tar.gz
Merge "zuma: move sepolicy related to bootctrl hal to gs-common" into main
-rw-r--r--vendor/device.te4
-rw-r--r--vendor/file.te1
-rw-r--r--vendor/file_contexts1
-rw-r--r--vendor/hal_bootctl_default.te8
4 files changed, 0 insertions, 14 deletions
diff --git a/vendor/device.te b/vendor/device.te
index ee136aa..fdb4957 100644
--- a/vendor/device.te
+++ b/vendor/device.te
@@ -1,7 +1,6 @@
type persist_block_device, dev_type;
type tee_persist_block_device, dev_type;
type custom_ab_block_device, dev_type;
-type devinfo_block_device, dev_type;
type mfg_data_block_device, dev_type;
type ufs_internal_block_device, dev_type;
type logbuffer_device, dev_type;
@@ -21,6 +20,3 @@ type gcma_camera_heap_device, dmabuf_heap_device_type, dev_type;
# SecureElement SPI device
type st54spi_device, dev_type;
-
-# OTA
-type sda_block_device, dev_type;
diff --git a/vendor/file.te b/vendor/file.te
index 81d41c1..6498f82 100644
--- a/vendor/file.te
+++ b/vendor/file.te
@@ -50,7 +50,6 @@ userdebug_or_eng(`
# sysfs
type sysfs_fabric, sysfs_type, fs_type;
type sysfs_em_profile, sysfs_type, fs_type;
-type sysfs_ota, sysfs_type, fs_type;
type sysfs_ospm, sysfs_type, fs_type;
# GSA
diff --git a/vendor/file_contexts b/vendor/file_contexts
index ba6f2bc..488cc40 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -1,6 +1,5 @@
# Binaries
/vendor/bin/hw/android\.hardware\.health-service\.zuma u:object_r:hal_health_default_exec:s0
-/vendor/bin/hw/android\.hardware\.boot-service\.default-zuma u:object_r:hal_bootctl_default_exec:s0
/vendor/bin/hw/android\.hardware\.power\.stats-service\.pixel u:object_r:hal_power_stats_default_exec:s0
/vendor/bin/hw/android\.hardware\.secure_element-service\.thales u:object_r:hal_secure_element_st54spi_aidl_exec:s0
/vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.goodix u:object_r:hal_fingerprint_default_exec:s0
diff --git a/vendor/hal_bootctl_default.te b/vendor/hal_bootctl_default.te
deleted file mode 100644
index 2ffeb27..0000000
--- a/vendor/hal_bootctl_default.te
+++ /dev/null
@@ -1,8 +0,0 @@
-allow hal_bootctl_default devinfo_block_device:blk_file rw_file_perms;
-allow hal_bootctl_default sda_block_device:blk_file rw_file_perms;
-allow hal_bootctl_default sysfs_ota:file rw_file_perms;
-allow hal_bootctl_default tee_device:chr_file rw_file_perms;
-
-recovery_only(`
- allow hal_bootctl_default rootfs:dir r_dir_perms;
-')