commit 2e44ea3c1b3387c95e268aede9d775dc912fa4a9
author Kenny Root <kroot@android.com> Mon Sep 17 12:07:03 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 12:07:03 2012 -0700
tree 03231d704362262795073741adb77a0d93abe012
parent c2cb712a0df482d3438e03fa4313b8009dce9e76
parent 9c08abbd3b21f61544335d350b7b982a5cc54eee

am 9c08abbd: Merge "Allow domain access to /dev/ion"

* commit '9c08abbd3b21f61544335d350b7b982a5cc54eee':
  Allow domain access to /dev/ion

domain.te

diff --git a/domain.te b/domain.te
index 6be7ddd..47ad05a 100644
--- a/domain.te
+++ b/domain.te
@@ -83,6 +83,9 @@
 allow domain cgroup:dir { search write };
 allow domain cgroup:file w_file_perms;
 
+#Allow access to ion memory allocation device
+allow domain ion_device:chr_file rw_file_perms;
+
 # For /sys/qemu_trace files in the emulator.
 bool in_qemu false;
 if (in_qemu) {

mediaserver.te

diff --git a/mediaserver.te b/mediaserver.te
index e124db0..4b299a0 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -25,7 +25,6 @@
 allow mediaserver sysfs:file rw_file_perms;
 # XXX Why?
 allow mediaserver apk_data_file:file { read getattr };
-allow mediaserver ion_device:chr_file rw_file_perms;
 
 # To use remote processor
 allow mediaserver rpmsg_device:chr_file rw_file_perms;