From 4f673cf4a900d1a2cff628bbc6e5a0b12e45f6d0 Mon Sep 17 00:00:00 2001
From: Primiano Tucci <primiano@google.com>
Date: Mon, 26 Mar 2018 09:54:09 +0000
Subject: [PATCH] Revert "Allow system server to set persist.traced.enable"
This reverts commit 6f2040f873119e2488f2419040baeae2f9cb61ba.
Reason for revert: not needed anymore after ag/3773705
This was meant to allow system_server toggling the property on/off.
Later we realized that we needed a separate property for that
(see discussion in b/76077784) and system server happens to
have already permissions to write to sys.* properties even without
this CL.
Reverting because at this point this creates just unnecessary clutter.
Change-Id: Ia73d000aad3c4288a5652047dfe10896e231b0b1
Test: perfetto_integrationtests
Bug: 76077784
---
private/compat/26.0/26.0.ignore.cil | 1 -
private/compat/27.0/27.0.ignore.cil | 1 -
private/property_contexts | 1 -
private/system_server.te | 1 -
public/property.te | 1 -
5 files changed, 5 deletions(-)
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index ce528f83e..080485147 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -107,7 +107,6 @@
traced_probes_exec
traced_probes_tmpfs
traced_producer_socket
- traced_prop
traced_tmpfs
update_engine_log_data_file
vendor_default_prop
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 7dad3cd2b..297c5ee0b 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -80,7 +80,6 @@
traced_probes_exec
traced_probes_tmpfs
traced_producer_socket
- traced_prop
traced_tmpfs
traceur_app
traceur_app_tmpfs
diff --git a/private/property_contexts b/private/property_contexts
index f3b05f95d..ecde9d3ea 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -59,7 +59,6 @@ persist.sys.audit_safemode u:object_r:safemode_prop:s0
persist.service. u:object_r:system_prop:s0
persist.service.bdroid. u:object_r:bluetooth_prop:s0
persist.security. u:object_r:system_prop:s0
-persist.traced. u:object_r:traced_prop:s0
persist.vendor.overlay. u:object_r:overlay_prop:s0
ro.boot.vendor.overlay. u:object_r:overlay_prop:s0
ro.boottime. u:object_r:boottime_prop:s0
diff --git a/private/system_server.te b/private/system_server.te
index 69ddb98b5..99c5442c4 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -504,7 +504,6 @@ set_prop(system_server, overlay_prop)
set_prop(system_server, exported_overlay_prop)
set_prop(system_server, pm_prop)
set_prop(system_server, exported_pm_prop)
-set_prop(system_server, traced_prop)
userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
# ctl interface
diff --git a/public/property.te b/public/property.te
index 77ee4f09a..a099e87b6 100644
--- a/public/property.te
+++ b/public/property.te
@@ -50,7 +50,6 @@ type shell_prop, property_type, core_property_type;
type system_boot_reason_prop, property_type;
type system_prop, property_type, core_property_type;
type system_radio_prop, property_type, core_property_type;
-type traced_prop, property_type;
type vold_prop, property_type, core_property_type;
type wifi_log_prop, property_type, log_property_type;
type wifi_prop, property_type;
--
GitLab