drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move definition for vendor_camera_binder_service into product

Browse Source 
vendor_camera_binder_service is defined in vendor image, but this
property is required and used from the system image. This causes
Cuttlefish Hybrid Device to fail from sepolicy error. This change is to
move system-required property from vendor to product so it can be used
when vendor image is changed into generic one.

Bug: 309469924
Test: Build and boot succeeded with cheetah
Change-Id: Iea3e5be110498f759e268df8b7e5126b65b06a67
This commit is contained in:
Kiyoung Kim 2023-11-14 16:43:05 +09:00
parent 1720877693
commit acc34fa037
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
camera/sepolicy/product/private/service_contexts Normal file
View File

@ -0,0 +1 @@
com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:camera_binder_service:s0

3
camera/sepolicy/product/private/vendor_pbcs_app.te
View File

@ -7,3 +7,6 @@ dontaudit vendor_pbcs_app system_app_data_file:dir *;
allow vendor_pbcs_app app_api_service:service_manager find;
# Allow PBCS to find Camera Service.
allow vendor_pbcs_app cameraserver_service:service_manager find;
# Allow PBCS to add the ServiceBinder service to ServiceManager.
add_service(vendor_pbcs_app, camera_binder_service);

1
camera/sepolicy/product/public/service.te Normal file
View File

@ -0,0 +1 @@
type camera_binder_service, hal_service_type, protected_service, service_manager_type;

2
camera/sepolicy/vendor/hal_camera_default.te vendored
View File

@ -1,4 +1,4 @@
allow hal_camera_default vendor_camera_binder_service:service_manager find;
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;

2
camera/sepolicy/vendor/service.te vendored
View File

@ -1,5 +1,3 @@
type vendor_camera_binder_service, hal_service_type, protected_service, service_manager_type;
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;

2
camera/sepolicy/vendor/service_contexts vendored
View File

@ -1,5 +1,3 @@
com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:vendor_camera_binder_service:s0
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

2
camera/sepolicy/vendor/vendor_pbcs_app.te vendored
View File

@ -1,5 +1,5 @@
# Allow PBCS to add the ServiceBinder service to ServiceManager.
add_service(vendor_pbcs_app, vendor_camera_binder_service);
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);
# Allow PBCS to add the CameraIdRemapper service to ServiceManager.