summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 16:04:36 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 16:04:36 +0000
commitbdb38b8df2b5f022561a4320e9a3d0a4d3edef0c (patch)
tree4b8a35f913beeaca59f703aee11850e02ca2fe9b
parent3c300d3d19bf5ba360c13a01ec5fe033b4fd46d6 (diff)
parent63cfe41fd230f69e4139160203d7e4fd0c4eb859 (diff)
downloadpixel-sepolicy-bdb38b8df2b5f022561a4320e9a3d0a4d3edef0c.tar.gz
Snap for 8512216 from 63cfe41fd230f69e4139160203d7e4fd0c4eb859 to tm-frc-os-statsd-release
Change-Id: I42370542526ee0b6554c5846e2d77fc1ad0b0003
-rw-r--r--citadel/hal_identity_citadel.te2
-rw-r--r--common/vendor/bug_map1
-rw-r--r--input/twoshay.te3
-rw-r--r--power-libperfmgr/hal_power_default.te6
-rw-r--r--vibrator/cs40l26/file_contexts3
-rw-r--r--vibrator/cs40l26/hal_vibrator_default.te10
-rw-r--r--wifi_perf_diag/property_contexts1
7 files changed, 25 insertions, 1 deletions
diff --git a/citadel/hal_identity_citadel.te b/citadel/hal_identity_citadel.te
index e29310c..c181e27 100644
--- a/citadel/hal_identity_citadel.te
+++ b/citadel/hal_identity_citadel.te
@@ -4,6 +4,8 @@ type hal_identity_citadel_exec, exec_type, vendor_file_type, file_type;
vndbinder_use(hal_identity_citadel)
binder_call(hal_identity_citadel, citadeld)
allow hal_identity_citadel citadeld_service:service_manager find;
+allow hal_identity_citadel hal_keymint_citadel:binder call;
hal_server_domain(hal_identity_citadel, hal_identity)
+hal_server_domain(hal_identity_citadel, hal_keymint)
init_daemon_domain(hal_identity_citadel)
diff --git a/common/vendor/bug_map b/common/vendor/bug_map
new file mode 100644
index 0000000..3f3e2e6
--- /dev/null
+++ b/common/vendor/bug_map
@@ -0,0 +1 @@
+dumpstate su process b/220019932
diff --git a/input/twoshay.te b/input/twoshay.te
index d27fda6..71b5771 100644
--- a/input/twoshay.te
+++ b/input/twoshay.te
@@ -18,3 +18,6 @@ allow twoshay dumpstate:fifo_file write;
# b/198755236
dontaudit twoshay twoshay:capability dac_override;
+
+# b/226830650
+dontaudit twoshay boot_status_prop:file read; \ No newline at end of file
diff --git a/power-libperfmgr/hal_power_default.te b/power-libperfmgr/hal_power_default.te
index 8d571e9..b4d4f65 100644
--- a/power-libperfmgr/hal_power_default.te
+++ b/power-libperfmgr/hal_power_default.te
@@ -28,6 +28,12 @@ allow hal_power_default proc_stat:file r_file_perms;
allow hal_power_default proc_vendor_sched:dir r_dir_perms;
allow hal_power_default proc_vendor_sched:file r_file_perms;
+# Allow read/write thermal sysfs
+allow hal_power_default thermal_link_device:dir r_dir_perms;
+allow hal_power_default sysfs_thermal:dir r_dir_perms;
+allow hal_power_default sysfs_thermal:file rw_file_perms;
+allow hal_power_default sysfs_thermal:lnk_file r_file_perms;
+
userdebug_or_eng(`
# Allow reading /data/vendor/* for debugging
allow hal_power_default vendor_data_file:file r_file_perms;
diff --git a/vibrator/cs40l26/file_contexts b/vibrator/cs40l26/file_contexts
index 13513c9..5c9f669 100644
--- a/vibrator/cs40l26/file_contexts
+++ b/vibrator/cs40l26/file_contexts
@@ -1,2 +1,5 @@
/vendor/bin/hw/android\.hardware\.vibrator-service\.cs40l26 u:object_r:hal_vibrator_default_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator-service\.cs40l26-dual u:object_r:hal_vibrator_default_exec:s0
+
+/dev/snd/pcmC0D24p u:object_r:vibrator_snd_device:s0
+/dev/snd/pcmC1D24p u:object_r:vibrator_snd_device:s0
diff --git a/vibrator/cs40l26/hal_vibrator_default.te b/vibrator/cs40l26/hal_vibrator_default.te
index 963a1c9..478bee9 100644
--- a/vibrator/cs40l26/hal_vibrator_default.te
+++ b/vibrator/cs40l26/hal_vibrator_default.te
@@ -1,5 +1,13 @@
-allow hal_vibrator_default input_device:dir search;
+allow hal_vibrator_default input_device:dir r_dir_perms;
allow hal_vibrator_default input_device:chr_file rw_file_perms;
+allow hal_vibrator_default sysfs_vibrator:dir search;
+allow hal_vibrator_default sysfs_vibrator:file rw_file_perms;
+
+allow hal_vibrator_default audio_device:dir search;
+allow hal_vibrator_default proc_asound:dir search;
+allow hal_vibrator_default proc_asound:file r_file_perms;
+allow hal_vibrator_default vibrator_snd_device:chr_file rw_file_perms;
+allow hal_vibrator_default vibrator_snd_device:dir search;
allow hal_vibrator_default mnt_vendor_file:dir search;
allow hal_vibrator_default persist_file:dir search;
diff --git a/wifi_perf_diag/property_contexts b/wifi_perf_diag/property_contexts
index dea1250..9ddc687 100644
--- a/wifi_perf_diag/property_contexts
+++ b/wifi_perf_diag/property_contexts
@@ -1,3 +1,4 @@
persist.vendor.wifi.perf_diag.period u:object_r:vendor_wifi_perf_diag_prop:s0
persist.vendor.wifi.perf_diag.file u:object_r:vendor_wifi_perf_diag_prop:s0
+persist.vendor.wifi.perf_diag.netperf u:object_r:vendor_wifi_perf_diag_prop:s0
vendor.wifi.perf_diag.start u:object_r:vendor_wifi_perf_diag_prop:s0