Merge "All hal policies expressed as attributes."

private/file_contexts

@@ -229,20 +229,20 @@
 /system/bin/webview_zygote64     u:object_r:webview_zygote_exec:s0
 /system/fake-lib(64)?/libart.*   u:object_r:libart_file:s0
 /system/lib(64)?/libart.*        u:object_r:libart_file:s0
-/system/bin/hw/android\.hardware\.audio@2\.0-service          u:object_r:hal_audio_exec:s0
+/system/bin/hw/android\.hardware\.audio@2\.0-service          u:object_r:hal_audio_default_exec:s0
 /system/bin/hw/android\.hardware\.boot@1\.0-service           u:object_r:hal_boot_exec:s0
-/system/bin/hw/android\.hardware\.ir@1\.0-service           u:object_r:hal_ir_default_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\.graphics\.allocator@2\.0-service   u:object_r:hal_graphics_allocator_default_exec:s0
+/system/bin/hw/android\.hardware\.graphics\.composer@2\.1-service    u:object_r:hal_graphics_composer_default_exec:s0
 /system/bin/hw/android\.hardware\.health@1\.0-service         u:object_r:hal_health_exec:s0
+/system/bin/hw/android\.hardware\.ir@1\.0-service             u:object_r:hal_ir_default_exec:s0
 /system/bin/hw/android\.hardware\.light@2\.0-service          u:object_r:hal_light_default_exec:s0
-/system/bin/hw/android\.hardware\.memtrack@1\.0-service       u:object_r:hal_memtrack_exec:s0
-/system/bin/hw/android\.hardware\.nfc@1\.0-service            u:object_r:hal_nfc_exec:s0
-/system/bin/hw/android\.hardware\.power@1\.0-service          u:object_r:hal_power_exec:s0
-/system/bin/hw/android\.hardware\.thermal@1\.0-service        u:object_r:hal_thermal_exec:s0
-/system/bin/hw/android\.hardware\.vibrator@1\.0-service       u:object_r:hal_vibrator_exec:s0
-/system/bin/hw/android\.hardware\.vr@1\.0-service             u:object_r:hal_vr_exec:s0
-/system/bin/hw/android\.hardware\.wifi@1\.0-service           u:object_r:hal_wifi_exec:s0
+/system/bin/hw/android\.hardware\.memtrack@1\.0-service       u:object_r:hal_memtrack_default_exec:s0
+/system/bin/hw/android\.hardware\.nfc@1\.0-service            u:object_r:hal_nfc_default_exec:s0
+/system/bin/hw/android\.hardware\.power@1\.0-service          u:object_r:hal_power_default_exec:s0
+/system/bin/hw/android\.hardware\.thermal@1\.0-service        u:object_r:hal_thermal_default_exec:s0
+/system/bin/hw/android\.hardware\.vibrator@1\.0-service       u:object_r:hal_vibrator_default_exec:s0
+/system/bin/hw/android\.hardware\.vr@1\.0-service             u:object_r:hal_vr_default_exec:s0
+/system/bin/hw/android\.hardware\.wifi@1\.0-service           u:object_r:hal_wifi_default_exec:s0
 
 #############################
 # Vendor files

private/hal_audio.te

-# type_transition must be private policy the domain_trans rules could stay
-# public, but conceptually should go with this
-init_daemon_domain(hal_audio)

private/hal_audio_default.te

+type hal_audio_default, hal_audio, domain;
+type hal_audio_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_audio_default)

private/hal_graphics_allocator.te

-init_daemon_domain(hal_graphics_allocator)

private/hal_graphics_allocator_default.te

+type hal_graphics_allocator_default, hal_graphics_allocator, domain;
+type hal_graphics_allocator_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_graphics_allocator_default)

private/hal_graphics_composer.te

-init_daemon_domain(hal_graphics_composer)

private/hal_graphics_composer_default.te

+type hal_graphics_composer_default, hal_graphics_composer, domain;
+type hal_graphics_composer_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_graphics_composer_default)

private/hal_ir_default.te

 type hal_ir_default, hal_ir, domain;
 type hal_ir_default_exec, exec_type, file_type;
 
-# may be started by init
 init_daemon_domain(hal_ir_default)

private/hal_light_default.te

 type hal_light_default, hal_light, domain;
 type hal_light_default_exec, exec_type, file_type;
 
-# may be started by init
 init_daemon_domain(hal_light_default)

private/hal_memtrack.te

-# may be started by init
-init_daemon_domain(hal_memtrack)

private/hal_memtrack_default.te

+type hal_memtrack_default, hal_memtrack, domain;
+type hal_memtrack_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_memtrack_default)

private/hal_nfc.te

-# may be started by init
-init_daemon_domain(hal_nfc)

private/hal_nfc_default.te

+type hal_nfc_default, hal_nfc, domain;
+type hal_nfc_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_nfc_default)

private/hal_power.te

-# may be started by init
-init_daemon_domain(hal_power)

private/hal_power_default.te

+type hal_power_default, hal_power, domain;
+type hal_power_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_power_default)

private/hal_thermal.te

-# May be started by init
-init_daemon_domain(hal_thermal)

private/hal_thermal_default.te

+type hal_thermal_default, hal_thermal, domain;
+type hal_thermal_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_thermal_default)

private/hal_vibrator.te

-# may be started by init
-init_daemon_domain(hal_vibrator)

private/hal_vibrator_default.te

+type hal_vibrator_default, hal_vibrator, domain;
+type hal_vibrator_default_exec, exec_type, file_type;
+
+init_daemon_domain(hal_vibrator_default)

private/hal_vr.te

-# may be started by init
-init_daemon_domain(hal_vr)