diff --git a/camera/sepolicy/product/private/service_contexts b/camera/sepolicy/product/private/service_contexts index 3d73df2..0cb84b4 100644 --- a/camera/sepolicy/product/private/service_contexts +++ b/camera/sepolicy/product/private/service_contexts @@ -1,3 +1,5 @@ com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:camera_binder_service:s0 com.google.pixel.camera.services.cameraidremapper.ICameraIdRemapper/default u:object_r:camera_cameraidremapper_service:s0 + +com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:camera_lyricconfigprovider_service:s0 diff --git a/camera/sepolicy/product/private/vendor_pbcs_app.te b/camera/sepolicy/product/private/vendor_pbcs_app.te index d166b63..b8a52d2 100644 --- a/camera/sepolicy/product/private/vendor_pbcs_app.te +++ b/camera/sepolicy/product/private/vendor_pbcs_app.te @@ -13,3 +13,6 @@ add_service(vendor_pbcs_app, camera_binder_service); # Allow PBCS to add the CameraIdRemapper service to ServiceManager. add_service(vendor_pbcs_app, camera_cameraidremapper_service); + +# Allow PBCS to add the LyricConfigProvider service to ServiceManager. +add_service(vendor_pbcs_app, camera_lyricconfigprovider_service); diff --git a/camera/sepolicy/product/private/vendor_pcs_app.te b/camera/sepolicy/product/private/vendor_pcs_app.te index f18bbd0..d41adb4 100644 --- a/camera/sepolicy/product/private/vendor_pcs_app.te +++ b/camera/sepolicy/product/private/vendor_pcs_app.te @@ -9,6 +9,7 @@ allow vendor_pcs_app { audioserver_service cameraserver_service camera_cameraidremapper_service + camera_lyricconfigprovider_service drmserver_service mediametrics_service mediaserver_service diff --git a/camera/sepolicy/product/public/service.te b/camera/sepolicy/product/public/service.te index 309e32f..2cdc125 100644 --- a/camera/sepolicy/product/public/service.te +++ b/camera/sepolicy/product/public/service.te @@ -1,3 +1,5 @@ type camera_binder_service, hal_service_type, protected_service, service_manager_type; type camera_cameraidremapper_service, hal_service_type, protected_service, service_manager_type; + +type camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type; diff --git a/camera/sepolicy/vendor/hal_camera_default.te b/camera/sepolicy/vendor/hal_camera_default.te index 9e7b105..f661eff 100644 --- a/camera/sepolicy/vendor/hal_camera_default.te +++ b/camera/sepolicy/vendor/hal_camera_default.te @@ -1,6 +1,6 @@ allow hal_camera_default camera_binder_service:service_manager find; # Allow Lyric Hal to find the LyricConfigProvider service through ServiceManager. -allow hal_camera_default vendor_camera_lyricconfigprovider_service:service_manager find; +allow hal_camera_default camera_lyricconfigprovider_service:service_manager find; allow hal_camera_default hal_pixel_remote_camera_service:service_manager find; diff --git a/camera/sepolicy/vendor/service.te b/camera/sepolicy/vendor/service.te index 232c33a..513ce05 100644 --- a/camera/sepolicy/vendor/service.te +++ b/camera/sepolicy/vendor/service.te @@ -1,7 +1,5 @@ type hal_pixel_remote_camera_service, hal_service_type, protected_service, service_manager_type; -type vendor_camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type; - type vendor_camera_isp_service, hal_service_type, protected_service, service_manager_type; type vendor_image_processing_hal_service, hal_service_type, protected_service, service_manager_type; diff --git a/camera/sepolicy/vendor/service_contexts b/camera/sepolicy/vendor/service_contexts index acf628a..47e13a7 100644 --- a/camera/sepolicy/vendor/service_contexts +++ b/camera/sepolicy/vendor/service_contexts @@ -1,7 +1,5 @@ com.google.pixel.camera.connectivity.hal.provider.ICameraProvider/default u:object_r:hal_pixel_remote_camera_service:s0 -com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:vendor_camera_lyricconfigprovider_service:s0 - com.google.pixel.camera.isp.IIspService/default u:object_r:vendor_camera_isp_service:s0 com.google.android.imageprocessing.IImageProcessingHal u:object_r:vendor_image_processing_hal_service:s0 diff --git a/camera/sepolicy/vendor/vendor_pbcs_app.te b/camera/sepolicy/vendor/vendor_pbcs_app.te index 8da191e..965ef54 100644 --- a/camera/sepolicy/vendor/vendor_pbcs_app.te +++ b/camera/sepolicy/vendor/vendor_pbcs_app.te @@ -1,7 +1,7 @@ # Allow PBCS to add the ServiceBinder service to ServiceManager. add_service(vendor_pbcs_app, camera_binder_service); # Allow PBCS to add the LyricConfigProvider service to ServiceManager. -add_service(vendor_pbcs_app, vendor_camera_lyricconfigprovider_service); +add_service(vendor_pbcs_app, camera_lyricconfigprovider_service); # Allow PBCS to add the CameraIdRemapper service to ServiceManager. add_service(vendor_pbcs_app, camera_cameraidremapper_service); diff --git a/camera/sepolicy/vendor/vendor_pcs_app.te b/camera/sepolicy/vendor/vendor_pcs_app.te index 9f27128..068a0f7 100644 --- a/camera/sepolicy/vendor/vendor_pcs_app.te +++ b/camera/sepolicy/vendor/vendor_pcs_app.te @@ -1,5 +1,5 @@ allow vendor_pcs_app { - vendor_camera_lyricconfigprovider_service + camera_lyricconfigprovider_service camera_cameraidremapper_service edgetpu_app_service }:service_manager find;