resolved conflicts for merge of b4fcaeea to lmp-dev-plus-aosp

Change-Id: I5946d6dc2256ba843a17c735d85df4d9ad5b07b2
2014-09-22 14:53:03 -07:00 · 2014-09-22 14:53:03 -07:00 · d118163543
commit d118163543
parent 864cee48db b4fcaeea34
1 changed files with 1 additions and 0 deletions
--- a/bootanim.te
+++ b/bootanim.te
@ -11,6 +11,7 @@ allow bootanim gpu_device:chr_file rw_file_perms;

 # /oem access
 allow bootanim oemfs:dir search;
+allow bootanim oemfs:file r_file_perms;

 # Audited locally.
 service_manager_local_audit_domain(bootanim)