author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 16:24:02 (GMT) |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-01 16:24:02 (GMT) |
commit | 8fc34ab83723c215d5e6b35109ed282b88101d3f (patch) | |
tree | 6e1f43b947597b4cd41f082cfdcb68f17d44e050 | |
parent | ef1805920b0d4b8838182ef298a60b14f94a4452 (diff) | |
parent | bc870881c78abbc1208082df6e1a9f70aec20dd1 (diff) | |
download | common-8fc34ab83723c215d5e6b35109ed282b88101d3f.zip common-8fc34ab83723c215d5e6b35109ed282b88101d3f.tar.gz common-8fc34ab83723c215d5e6b35109ed282b88101d3f.tar.bz2 |
Merge q-tv-dev to q-tv-r1-dev am: b5f319b9e1 am: bc870881c7
Change-Id: Ie0975793b9b28e3709d9814cebea57076b0284d4
-rwxr-xr-x | sepolicy/file_contexts | 1 | ||||
-rw-r--r-- | sepolicy/hal_audio_amlogic.te | 61 | ||||
-rwxr-xr-x | sepolicy/hal_audio_default.te | 49 |
3 files changed, 49 insertions, 62 deletions
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 0d78399..684bf83 100755 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -310,7 +310,6 @@ /vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.mock u:object_r:hal_power_stats_default_exec:s0 /vendor/bin/hw/android\.hardware\.graphics\.composer@2\.3-service\.droidlogic u:object_r:hal_graphics_composer_default_exec:s0 /vendor/bin/hw/android\.hardware\.thermal@2\.0-service.droidlogic u:object_r:hal_thermal_default_exec:s0 -/vendor/bin/hw/android\.hardware\.audio@2\.0-service u:object_r:hal_audio_amlogic_exec:s0 /data/vendor/mediadrm(/.*)? u:object_r:hal_drm_data:s0 diff --git a/sepolicy/hal_audio_amlogic.te b/sepolicy/hal_audio_amlogic.te deleted file mode 100644 index 3b66752..0000000 --- a/sepolicy/hal_audio_amlogic.te +++ b/dev/null @@ -1,61 +0,0 @@ -######################################### -# sepolicy rules for hal_audio_amlogic -######################################### -type hal_audio_amlogic, domain, socket_between_core_and_vendor_violators; -hal_server_domain(hal_audio_amlogic, hal_audio) - -type hal_audio_amlogic_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_audio_amlogic) - -hal_client_domain(hal_audio_amlogic, hal_allocator) - -# allow audioserver to call hal_audio dump with its own fd to retrieve status -allow hal_audio_amlogic audioserver:fifo_file write; - -allow hal_audio_amlogic sysfs_audio_cap:file { read open }; -allow hal_audio_amlogic sysfs_digital_codec:file { write read open }; -allow hal_audio_amlogic sysfs_amhdmitx:dir search; -allow hal_audio_amlogic kernel:system { module_request }; -allow hal_audio_amlogic media_prop:file { read open getattr }; -allow hal_audio_amlogic media_prop:property_service { set }; -allow hal_audio_amlogic shell_data_file:file { read write }; -allow hal_audio_amlogic sysfs_xbmc:file { read open write }; -allow hal_audio_amlogic hidraw_device:chr_file { create read write open ioctl}; -allow hal_audio_amlogic property_socket:sock_file { write }; -allow hal_audio_amlogic init:unix_stream_socket { connectto }; -allow hal_audio_amlogic sysfs_video:file { read open }; -allow hal_audio_amlogic sysfs_video:dir search; -#--------------------------------------------------------------------# -# product_shipping_api_level=28 -#--------------------------------------------------------------------# -get_prop(hal_audio_amlogic, vendor_platform_prop) - -allow hal_audio_amlogic sysfs_aud_output_chs:file { open read write }; -allow hal_audio_amlogic sysfs_aud_output_chs:file { read write open }; -allow hal_audio_amlogic remotecontrol_hwservice:hwservice_manager find; -allow hal_audio_amlogic sysfs:file { open read write }; -allow hal_audio_amlogic sysfs_extcon:dir { search }; -allow hal_audio_amlogic uio_device:chr_file { open read write }; -allow hal_audio_amlogic system_app:binder call; -allow hal_audio_amlogic tv_prop:file { read getattr open }; -allow hal_audio_amlogic hidraw_audio_device:chr_file { create read write open ioctl}; -allow hal_audio_amlogic device:dir {read open}; -allow hal_audio_amlogic btmic_data_file:dir {write read open add_name search}; -allow hal_audio_amlogic btmic_data_file:file {write open create}; -#[SEI-zhaopf-2018-12-18]add for hbg remote { -allow hal_audio_amlogic sysfs:dir { open read }; -allow hal_audio_amlogic vendor_data_file:dir { add_name remove_name write }; -allow hal_audio_amlogic vendor_data_file:lnk_file { read }; -allow hal_audio_amlogic vendor_data_file:file { create read open setattr unlink}; -allow hal_audio_amlogic dvb_device:chr_file { open read write ioctl }; -allow hal_audio_amlogic frontend_device:chr_file { open read write ioctl }; -allow hal_audio_amlogic codec_device:chr_file { read write open ioctl }; -#allow hal_audio_amlogic hidraw_audio_device:chr_file { create read write open ioctl}; -#allow hal_audio_amlogic device:dir{ read }; -#allow hal_audio_amlogic default_prop:file{ read }; -#[SEI-zhaopf-2018-12-18]add for hbg remote } -allow hal_audio_amlogic sysfs_astream:file { open read }; -allow hal_audio_amlogic sysfs_astream:dir { search }; -allow hal_audio_amlogic sysfs_audio:file { read write open }; -allow hal_audio_amlogic bluetooth:unix_stream_socket connectto; -allow hal_audio_amlogic self:netlink_kobject_uevent_socket { create bind setopt read }; diff --git a/sepolicy/hal_audio_default.te b/sepolicy/hal_audio_default.te new file mode 100755 index 0000000..5d7bc6e --- a/dev/null +++ b/sepolicy/hal_audio_default.te @@ -0,0 +1,49 @@ +######################################### +# sepolicy rules for hal_audio_default +######################################### +allow hal_audio_default sysfs_audio_cap:file { read open }; +allow hal_audio_default sysfs_digital_codec:file { write read open }; +allow hal_audio_default sysfs_amhdmitx:dir search; +allow hal_audio_default kernel:system { module_request }; +allow hal_audio_default media_prop:file { read open getattr }; +allow hal_audio_default media_prop:property_service { set }; +allow hal_audio_default shell_data_file:file { read write }; +allow hal_audio_default sysfs_xbmc:file { read open write }; +allow hal_audio_default hidraw_device:chr_file { create read write open ioctl}; +allow hal_audio_default property_socket:sock_file { write }; +allow hal_audio_default init:unix_stream_socket { connectto }; +allow hal_audio_default sysfs_video:file { read open }; +allow hal_audio_default sysfs_video:dir search; + +#--------------------------------------------------------------------# +# product_shipping_api_level=28 +#--------------------------------------------------------------------# +get_prop(hal_audio_default, vendor_platform_prop) + +allow hal_audio_default sysfs_aud_output_chs:file { open read write }; +allow hal_audio_default sysfs_aud_output_chs:file { read write open }; +allow hal_audio_default remotecontrol_hwservice:hwservice_manager find; +allow hal_audio_default sysfs:file { open read write }; +allow hal_audio_default sysfs_extcon:dir { search }; +allow hal_audio_default uio_device:chr_file { open read write }; +allow hal_audio_default system_app:binder call; +allow hal_audio_default tv_prop:file { read getattr open }; +allow hal_audio_default hidraw_audio_device:chr_file { create read write open ioctl}; +allow hal_audio_default device:dir {read open}; +allow hal_audio_default btmic_data_file:dir {write read open add_name search}; +allow hal_audio_default btmic_data_file:file {write open create}; +#[SEI-zhaopf-2018-12-18]add for hbg remote { +allow hal_audio_default sysfs:dir { open read }; +allow hal_audio_default vendor_data_file:dir { add_name remove_name write }; +allow hal_audio_default vendor_data_file:lnk_file { read }; +allow hal_audio_default vendor_data_file:file { create read open setattr unlink}; +allow hal_audio_default dvb_device:chr_file { open read write ioctl }; +allow hal_audio_default frontend_device:chr_file { open read write ioctl }; +allow hal_audio_default codec_device:chr_file { read write open ioctl }; +#allow hal_audio_default hidraw_audio_device:chr_file { create read write open ioctl}; +#allow hal_audio_default device:dir{ read }; +#allow hal_audio_default default_prop:file{ read }; +#[SEI-zhaopf-2018-12-18]add for hbg remote } +allow hal_audio_default sysfs_astream:file { open read }; +allow hal_audio_default sysfs_astream:dir { search }; +allow hal_audio_default sysfs_audio:file { read write open }; |