Merge "OsloFeedback: updated sepolicy"
diff --git a/tracking_denials/incidentd.te b/tracking_denials/incidentd.te
new file mode 100644
index 0000000..9990775
--- /dev/null
+++ b/tracking_denials/incidentd.te
@@ -0,0 +1,2 @@
+# b/187365845
+dontaudit incidentd apex_info_file:file getattr;
diff --git a/vendor/google/property.te b/vendor/google/property.te
index 0e2cb3f..623efa3 100644
--- a/vendor/google/property.te
+++ b/vendor/google/property.te
@@ -19,6 +19,9 @@
#ramoops
vendor_internal_prop(vendor_ramoops_prop)
+# battery_profile
+vendor_internal_prop(vendor_battery_profile_prop)
+
#ecoservice
vendor_internal_prop(ecoservice_prop)
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index 3acdede..7a5c22a 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -22,6 +22,9 @@
# battery
vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0
+# test battery profile
+persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0
+
# Tcpdump_logger
persist.vendor.tcpdump.log.alwayson u:object_r:vendor_tcpdump_log_prop:s0
vendor.tcpdump.log.ondemand u:object_r:vendor_tcpdump_log_prop:s0
diff --git a/vendor/google/vendor_init.te b/vendor/google/vendor_init.te
index 7ec076d..1626438 100644
--- a/vendor/google/vendor_init.te
+++ b/vendor/google/vendor_init.te
@@ -32,3 +32,6 @@
')
set_prop(vendor_init, vendor_logging_prop)
+get_prop(vendor_init, test_harness_prop)
+get_prop(vendor_init, vendor_battery_profile_prop)
+set_prop(vendor_init, vendor_battery_defender_prop)
diff --git a/vendor/google/vendor_shell.te b/vendor/google/vendor_shell.te
new file mode 100644
index 0000000..2ace587
--- /dev/null
+++ b/vendor/google/vendor_shell.te
@@ -0,0 +1 @@
+set_prop(vendor_shell, vendor_battery_profile_prop)
