From b802fbff4b8ff670489328b7f7ec8940790922e1 Mon Sep 17 00:00:00 2001 From: pix106 Date: Fri, 6 May 2022 05:03:14 +0200 Subject: [PATCH] sdm660-common: sepolicy: fix sepolicy to use vendor_camera_prop --- sepolicy/vendor/app.te | 2 +- sepolicy/vendor/cameraserver.te | 2 +- sepolicy/vendor/hal_camera_default.te | 6 ++---- sepolicy/vendor/hal_sensors_default.te | 2 +- sepolicy/vendor/property.te | 2 +- sepolicy/vendor/vendor_init.te | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sepolicy/vendor/app.te b/sepolicy/vendor/app.te index bb99f888..def8a3eb 100644 --- a/sepolicy/vendor/app.te +++ b/sepolicy/vendor/app.te @@ -5,4 +5,4 @@ allow { appdomain -isolated_app } adsprpcd_file:dir r_dir_perms; allow { appdomain -isolated_app } public_adsprpcd_file:file r_file_perms; get_prop(appdomain, exported_camera_prop) -get_prop(appdomain, vendor_persist_camera_prop) +get_prop(appdomain, vendor_camera_prop) diff --git a/sepolicy/vendor/cameraserver.te b/sepolicy/vendor/cameraserver.te index c343eaa6..ddfe0d61 100644 --- a/sepolicy/vendor/cameraserver.te +++ b/sepolicy/vendor/cameraserver.te @@ -1,5 +1,5 @@ binder_call(cameraserver, mediacodec); -get_prop(cameraserver, vendor_persist_camera_prop) +get_prop(cameraserver, vendor_camera_prop) get_prop(cameraserver, vendor_video_prop) set_prop(cameraserver, system_prop) binder_call(cameraserver, mediacodec) diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te index c0642730..dabc775b 100644 --- a/sepolicy/vendor/hal_camera_default.te +++ b/sepolicy/vendor/hal_camera_default.te @@ -1,11 +1,11 @@ hal_client_domain(hal_camera_default, hal_configstore) hal_client_domain(hal_camera_default, hal_graphics_allocator) get_prop(hal_camera_default, bootanim_system_prop) +get_prop(hal_camera_default, hal_camera_prop) get_prop(hal_camera_default, vendor_camera_prop) +set_prop(hal_camera_default, vendor_camera_prop) get_prop(hal_camera_default, vendor_system_prop) get_prop(hal_camera_default, vendor_video_prop) -get_prop(hal_camera_default, persist_camera_prop) -set_prop(hal_camera_default, persist_camera_prop) allow hal_camera_default sysfs_kgsl:file r_file_perms; allow hal_camera_default diag_device:chr_file rw_file_perms; @@ -14,5 +14,3 @@ allow hal_camera_default sysfs:file { getattr open read }; allow hal_camera_default self:socket { read write }; r_dir_file(hal_camera_default, sysfs_kgsl) - -dontaudit hal_camera_default default_prop:file read; diff --git a/sepolicy/vendor/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te index 11d04b12..51b03cef 100644 --- a/sepolicy/vendor/hal_sensors_default.te +++ b/sepolicy/vendor/hal_sensors_default.te @@ -3,4 +3,4 @@ allow hal_sensors_default sysfs_info:file { read write }; allow hal_sensors_default diag_device:chr_file { read }; unix_socket_connect(hal_sensors_default, audio, hal_audio_default) -set_prop(hal_sensors_default, camera_prop) +set_prop(hal_sensors_default, vendor_camera_prop) diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index ce06e2ba..6255d221 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -1,7 +1,7 @@ vendor_public_prop(hal_fingerprint_prop); +vendor_public_prop(hal_camera_prop); vendor_public_prop(mlipay_prop); vendor_restricted_prop(vendor_camera_prop); vendor_internal_prop(dirac_prop); vendor_internal_prop(vendor_power_prop) vendor_internal_prop(thermal_engine_prop); -vendor_restricted_prop(persist_camera_prop); diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te index 62f6c952..7c7af021 100644 --- a/sepolicy/vendor/vendor_init.te +++ b/sepolicy/vendor/vendor_init.te @@ -11,6 +11,6 @@ allow vendor_init proc:file w_file_perms; get_prop(vendor_init, hal_fingerprint_prop) -set_prop(vendor_init, camera_prop) +set_prop(vendor_init, vendor_camera_prop) set_prop(vendor_init, vendor_freq_prop) set_prop(vendor_init, vendor_power_prop)