resolve merge conflicts of 833485b to master

Test: policy compiles
Change-Id: I709b0b8c74b25671a1e6509802131459348deb40
This commit is contained in:
Nick Kralevich 2016-11-15 15:38:25 -08:00
commit 027bf8e60d
5 changed files with 28 additions and 0 deletions

View File

@ -227,6 +227,7 @@
/system/bin/hw/android\.hardware\.audio@2\.0-service u:object_r:hal_audio_exec:s0
/system/bin/hw/android\.hardware\.boot@1\.0-service u:object_r:hal_boot_exec:s0
/system/bin/hw/android\.hardware\.graphics\.allocator@2\.0-service u:object_r:hal_graphics_allocator_exec:s0
/system/bin/hw/android\.hardware\.graphics\.composer@2\.1-service u:object_r:hal_graphics_composer_exec:s0
/system/bin/hw/android\.hardware\.health@1\.0-service u:object_r:hal_health_exec:s0
/system/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_exec:s0
/system/bin/hw/android\.hardware\.memtrack@1\.0-service u:object_r:hal_memtrack_exec:s0

View File

@ -0,0 +1 @@
init_daemon_domain(hal_graphics_composer)

View File

@ -22,6 +22,9 @@ allow bootanim surfaceflinger_service:service_manager find;
allow bootanim ion_device:chr_file rw_file_perms;
allow bootanim hal_graphics_allocator:fd use;
# Fences
allow bootanim hal_graphics_composer:fd use;
# Read access to pseudo filesystems.
r_dir_file(bootanim, proc)
allow bootanim proc_meminfo:file r_file_perms;

View File

@ -0,0 +1,22 @@
# graphics composer subsystem
type hal_graphics_composer, domain;
type hal_graphics_composer_exec, exec_type, file_type;
# HwBinder access
hwbinder_use(hal_graphics_composer)
# IComposerCallback
binder_call(hal_graphics_composer, surfaceflinger)
# GPU device access
allow hal_graphics_composer gpu_device:chr_file rw_file_perms;
allow hal_graphics_composer ion_device:chr_file r_file_perms;
allow hal_graphics_composer hal_graphics_allocator:fd use;
# Access /dev/graphics/fb0.
allow hal_graphics_composer graphics_device:dir search;
allow hal_graphics_composer graphics_device:chr_file rw_file_perms;
# Fences
allow hal_graphics_composer system_server:fd use;
allow hal_graphics_composer bootanim:fd use;
allow hal_graphics_composer {appdomain ephemeral_app}:fd use;

View File

@ -7,6 +7,7 @@ typeattribute surfaceflinger mlstrustedsubject;
# Perform HwBinder IPC.
hwbinder_use(surfaceflinger)
binder_call(surfaceflinger, hal_graphics_allocator)
binder_call(surfaceflinger, hal_graphics_composer)
# Perform Binder IPC.
binder_use(surfaceflinger)