From 9e6979636fdc1ca02145aa14873f0444bbb5069c Mon Sep 17 00:00:00 2001
From: Vineeta Srivastava <vsrivastava@google.com>
Date: Tue, 16 Sep 2014 13:04:06 -0700
Subject: [PATCH] resolved conflicts for merge of 0a20b57f to lmp-dev-plus-aosp
Change-Id: I6a0d56c23888535964e1559cb8ad63fedd27db47
---
drmserver.te | 3 +++
mediaserver.te | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drmserver.te b/drmserver.te
index 2a146b6bb..428b3d3b9 100644
--- a/drmserver.te
+++ b/drmserver.te
@@ -47,6 +47,9 @@ allow drmserver radio_data_file:file { read getattr };
allow drmserver drmserver_service:service_manager add;
+# /oem access
+allow drmserver oemfs:file r_file_perms;
+
# Audited locally.
service_manager_local_audit_domain(drmserver)
auditallow drmserver {
diff --git a/mediaserver.te b/mediaserver.te
index 3eb078d4b..dc94fc820 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -80,6 +80,9 @@ allow mediaserver tee:unix_stream_socket connectto;
allow mediaserver mediaserver_service:service_manager add;
+# /oem access
+allow mediaserver oemfs:file r_file_perms;
+
# Audited locally.
service_manager_local_audit_domain(mediaserver)
auditallow mediaserver {
--
GitLab