From 8f97c66e99ba17c94cc96e7352c1bb0c95be01d4 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 6 Jun 2016 12:18:46 -0700
Subject: [PATCH] logpersist: reserve persist.logd.logpersistd

(cherry-pick from commit 68d67a0fd16f5167506429b3a8c14434943da264)

shell, system_app and logd access granted on debug builds only

Add logd.logpersistd as well

Bug: 28936216
Bug: 28788401
Change-Id: Ib9648e8565cc0ea0077cf0950b0e4ac6fe0a3135
---
 logd.te           | 1 +
 property.te       | 1 +
 property_contexts | 2 ++
 shell.te          | 1 +
 system_app.te     | 1 +
 5 files changed, 6 insertions(+)

diff --git a/logd.te b/logd.te
index 97bbd8be3..bc97a3754 100644
--- a/logd.te
+++ b/logd.te
@@ -28,6 +28,7 @@ set_prop(logd, powerctl_prop)
 
 # Access device logging gating property
 get_prop(logd, device_logging_prop)
+userdebug_or_eng(`get_prop(logd, logpersistd_logging_prop)')
 
 r_dir_file(logd, domain)
 
diff --git a/property.te b/property.te
index 64dbdef76..af7013f4c 100644
--- a/property.te
+++ b/property.te
@@ -25,6 +25,7 @@ type audio_prop, property_type, core_property_type;
 type log_prop, property_type, log_property_type;
 type log_tag_prop, property_type, log_property_type;
 type logd_prop, property_type, core_property_type;
+type logpersistd_logging_prop, property_type;
 type mmc_prop, property_type;
 type restorecon_prop, property_type, core_property_type;
 type security_prop, property_type, core_property_type;
diff --git a/property_contexts b/property_contexts
index 1ab1f1073..4368a989b 100644
--- a/property_contexts
+++ b/property_contexts
@@ -44,6 +44,8 @@ persist.audio.          u:object_r:audio_prop:s0
 persist.debug.          u:object_r:persist_debug_prop:s0
 persist.logd.           u:object_r:logd_prop:s0
 persist.logd.security   u:object_r:device_logging_prop:s0
+persist.logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
+logd.logpersistd        u:object_r:logpersistd_logging_prop:s0
 persist.log.tag         u:object_r:log_tag_prop:s0
 persist.mmc.            u:object_r:mmc_prop:s0
 persist.sys.            u:object_r:system_prop:s0
diff --git a/shell.te b/shell.te
index 056eeb6ff..3e95b4687 100644
--- a/shell.te
+++ b/shell.te
@@ -70,6 +70,7 @@ set_prop(shell, powerctl_prop)
 set_prop(shell, log_tag_prop)
 set_prop(shell, wifi_log_prop)
 userdebug_or_eng(`set_prop(shell, log_prop)')
+userdebug_or_eng(`set_prop(shell, logpersistd_logging_prop)')
 
 # systrace support - allow atrace to run
 allow shell debugfs_tracing:dir r_dir_perms;
diff --git a/system_app.te b/system_app.te
index 2d51c5a10..50320c5c7 100644
--- a/system_app.te
+++ b/system_app.te
@@ -32,6 +32,7 @@ set_prop(system_app, logd_prop)
 set_prop(system_app, net_radio_prop)
 set_prop(system_app, system_radio_prop)
 set_prop(system_app, log_tag_prop)
+userdebug_or_eng(`set_prop(system_app, logpersistd_logging_prop)')
 auditallow system_app net_radio_prop:property_service set;
 auditallow system_app system_radio_prop:property_service set;
 
-- 
GitLab