resolved conflicts for merge of 0a52df50 to lmp-dev-plus-aosp

Change-Id: I3c6af086fc8ca3e9600c2267c439718c9a572dfb
This commit is contained in:
Mike Lockwood 2014-10-06 11:56:31 -07:00
commit 2043a28e5b

View File

@ -13,6 +13,9 @@ allow bootanim gpu_device:chr_file rw_file_perms;
allow bootanim oemfs:dir search;
allow bootanim oemfs:file r_file_perms;
allow bootanim audio_device:dir r_dir_perms;
allow bootanim audio_device:chr_file rw_file_perms;
# Audited locally.
service_manager_local_audit_domain(bootanim)
auditallow bootanim { service_manager_type -surfaceflinger_service }:service_manager find;