[automerger skipped] Merge Android U (ab/10368041) am: ddbca9e70a -s ours am: e5298425c4 -s ours am: 85c789a46e -s ours am: 8ed4f45a95 -s ours
am skip reason: Merged-In Ib9f0a43dfd2ffbd9729b56b12a12ffaa74f2b7a1 with SHA-1 de7a7c1338 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/24182884
Change-Id: Ib7d597bd8b7266b1882b26504b1e52b0101c58f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/citadel/citadeld.te b/citadel/citadeld.te
index 9490258..959704b 100644
--- a/citadel/citadeld.te
+++ b/citadel/citadeld.te
@@ -18,3 +18,6 @@
binder_call(citadeld, stats_service_server)
allow citadeld fwk_stats_service:service_manager find;
binder_use(citadeld)
+
+# Let citadeld set property
+set_prop(citadeld, vendor_nos_citadel_version);
diff --git a/citadel/property.te b/citadel/property.te
new file mode 100644
index 0000000..2e1c4ec
--- /dev/null
+++ b/citadel/property.te
@@ -0,0 +1 @@
+vendor_internal_prop(vendor_nos_citadel_version)
diff --git a/citadel/property_contexts b/citadel/property_contexts
new file mode 100644
index 0000000..835de17
--- /dev/null
+++ b/citadel/property_contexts
@@ -0,0 +1 @@
+vendor.nos.citadel.version u:object_r:vendor_nos_citadel_version:s0
diff --git a/common/vendor/te_macros b/common/vendor/te_macros
index c9a9c04..99873fe 100644
--- a/common/vendor/te_macros
+++ b/common/vendor/te_macros
@@ -12,6 +12,7 @@
allow $1 dumpstate:fd use;
allow $1 dumpstate:fifo_file { write getattr };
allow $1 hal_dumpstate_default:fd use;
+allow hal_dumpstate_default $1:process { sigkill signal };
allow $1 shell_data_file:file { write getattr };
')
