Merge "Service context for servicemanager." am: 3057643aef am: a756a73b3d am: 216bbfa2fe

am: 9c90230245

Change-Id: I749ad521ba8b1c395ba8f63f25da1869c3cbdbc7
This commit is contained in:
Steven Moreland 2019-10-23 10:49:26 -07:00 committed by android-build-merger
commit 4e267b9629
4 changed files with 5 additions and 0 deletions

View file

@ -21,6 +21,7 @@
mock_ota_prop mock_ota_prop
ota_metadata_file ota_metadata_file
art_apex_dir art_apex_dir
service_manager_service
system_group_file system_group_file
system_passwd_file system_passwd_file
vendor_apex_file vendor_apex_file

View file

@ -168,6 +168,7 @@ sensorservice u:object_r:sensorservice_service:s0
sensor_privacy u:object_r:sensor_privacy_service:s0 sensor_privacy u:object_r:sensor_privacy_service:s0
serial u:object_r:serial_service:s0 serial u:object_r:serial_service:s0
servicediscovery u:object_r:servicediscovery_service:s0 servicediscovery u:object_r:servicediscovery_service:s0
manager u:object_r:service_manager_service:s0
settings u:object_r:settings_service:s0 settings u:object_r:settings_service:s0
shortcut u:object_r:shortcut_service:s0 shortcut u:object_r:shortcut_service:s0
simphonebook_msim u:object_r:radio_service:s0 simphonebook_msim u:object_r:radio_service:s0

View file

@ -25,6 +25,7 @@ type netd_service, service_manager_type;
type nfc_service, service_manager_type; type nfc_service, service_manager_type;
type radio_service, service_manager_type; type radio_service, service_manager_type;
type secure_element_service, service_manager_type; type secure_element_service, service_manager_type;
type service_manager_service, service_manager_type;
type storaged_service, service_manager_type; type storaged_service, service_manager_type;
type surfaceflinger_service, app_api_service, ephemeral_app_api_service, service_manager_type; type surfaceflinger_service, app_api_service, ephemeral_app_api_service, service_manager_type;
type system_app_service, service_manager_type; type system_app_service, service_manager_type;

View file

@ -21,5 +21,7 @@ allow servicemanager service_contexts_file:file r_file_perms;
# nonplat_service_contexts only accessible on non full-treble devices # nonplat_service_contexts only accessible on non full-treble devices
not_full_treble(`allow servicemanager nonplat_service_contexts_file:file r_file_perms;') not_full_treble(`allow servicemanager nonplat_service_contexts_file:file r_file_perms;')
add_service(servicemanager, service_manager_service)
# Check SELinux permissions. # Check SELinux permissions.
selinux_check_access(servicemanager) selinux_check_access(servicemanager)