Merge "Add SePolicy allowances for ICameraIdRemapper" into udc-qpr-dev am: 8be8295748 am: d6d12b773d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/24344518
Change-Id: I6e34580adf1e6d60f1dd5359060e12cc2af5da05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/sepolicy/service.te b/camera/sepolicy/service.te
index 1f1ac79..877dbc1 100644
--- a/camera/sepolicy/service.te
+++ b/camera/sepolicy/service.te
@@ -5,3 +5,5 @@
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_camera_cameraidremapper_service, hal_service_type, protected_service, service_manager_type;
diff --git a/camera/sepolicy/service_contexts b/camera/sepolicy/service_contexts
index 50b89df..e6eaa64 100644
--- a/camera/sepolicy/service_contexts
+++ b/camera/sepolicy/service_contexts
@@ -6,3 +6,4 @@
com.google.pixel.camera.isp.IIspService/default u:object_r:vendor_camera_isp_service:s0
+com.google.pixel.camera.services.cameraidremapper.ICameraIdRemapper/default u:object_r:vendor_camera_cameraidremapper_service:s0
diff --git a/camera/sepolicy/vendor_pbcs_app.te b/camera/sepolicy/vendor_pbcs_app.te
index 8c55d0e..2a56b2d 100644
--- a/camera/sepolicy/vendor_pbcs_app.te
+++ b/camera/sepolicy/vendor_pbcs_app.te
@@ -12,6 +12,8 @@
add_service(vendor_pbcs_app, vendor_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.
+add_service(vendor_pbcs_app, vendor_camera_cameraidremapper_service);
binder_call(vendor_pbcs_app, hal_camera_default);
diff --git a/camera/sepolicy/vendor_pcs_app.te b/camera/sepolicy/vendor_pcs_app.te
index ad15405..67d44db 100644
--- a/camera/sepolicy/vendor_pcs_app.te
+++ b/camera/sepolicy/vendor_pcs_app.te
@@ -8,6 +8,8 @@
# Allow PCS to find the LyricConfigProvider service through ServiceManager.
allow vendor_pcs_app vendor_camera_lyricconfigprovider_service:service_manager find;
+# Allow PCS to find the CameraIdRemapper service through ServiceManager.
+allow vendor_pcs_app vendor_camera_cameraidremapper_service:service_manager find;
allow vendor_pcs_app hal_pixel_remote_camera_service:service_manager add;