Merge "Allow camera HAL and GCA to access GXP device."

This commit is contained in:
Dinesh Yadav 2023-01-18 07:33:32 +00:00 committed by Android (Google) Code Review
commit 3de9d17052
5 changed files with 9 additions and 6 deletions

View file

@ -6,7 +6,6 @@
# Vendor Firmwares # Vendor Firmwares
/vendor/firmware/mali_csffw\.bin u:object_r:same_process_hal_file:s0 /vendor/firmware/mali_csffw\.bin u:object_r:same_process_hal_file:s0
/vendor/firmware/gxp_fw_core[0-3] u:object_r:same_process_hal_file:s0
# Vendor libraries # Vendor libraries
/vendor/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0
@ -20,7 +19,6 @@
/vendor/lib(64)?/android\.frameworks\.stats-V1-ndk\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/android\.frameworks\.stats-V1-ndk\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/vendor-pixelatoms-cpp\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/vendor-pixelatoms-cpp\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libprotobuf-cpp-lite-(\d+\.){2,3}so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libprotobuf-cpp-lite-(\d+\.){2,3}so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libgxp\.so u:object_r:same_process_hal_file:s0
# Graphics # Graphics
/vendor/lib(64)?/hw/vulkan\.mali\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/hw/vulkan\.mali\.so u:object_r:same_process_hal_file:s0

View file

@ -1,7 +1,3 @@
# b/264321380
dontaudit hal_camera_default gxp_device:chr_file { ioctl };
dontaudit hal_camera_default gxp_device:chr_file { open };
dontaudit hal_camera_default gxp_device:chr_file { read write };
# b/264489778 # b/264489778
userdebug_or_eng(` userdebug_or_eng(`
permissive hal_camera_default; permissive hal_camera_default;

View file

@ -31,6 +31,10 @@
/vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0
/vendor/lib64/arm\.mali\.platform-V1-ndk\.so u:object_r:same_process_hal_file:s0 /vendor/lib64/arm\.mali\.platform-V1-ndk\.so u:object_r:same_process_hal_file:s0
# Vendor libraries
/vendor/lib(64)?/libgxp\.so u:object_r:same_process_hal_file:s0
# persist # persist
/mnt/vendor/persist/camera(/.*)? u:object_r:persist_camera_file:s0 /mnt/vendor/persist/camera(/.*)? u:object_r:persist_camera_file:s0
/mnt/vendor/persist/display(/.*)? u:object_r:persist_display_file:s0 /mnt/vendor/persist/display(/.*)? u:object_r:persist_display_file:s0

View file

@ -1,3 +1,5 @@
type google_camera_app, domain, coredomain; type google_camera_app, domain, coredomain;
app_domain(google_camera_app) app_domain(google_camera_app)
# Allows camera app to access the GXP device.
allow google_camera_app gxp_device:chr_file rw_file_perms;

View file

@ -23,6 +23,9 @@ allow hal_camera_default persist_camera_file:file create_file_perms;
allow hal_camera_default vendor_camera_data_file:dir rw_dir_perms; allow hal_camera_default vendor_camera_data_file:dir rw_dir_perms;
allow hal_camera_default vendor_camera_data_file:file create_file_perms; allow hal_camera_default vendor_camera_data_file:file create_file_perms;
# Allow the camera hal to access the GXP device.
allow hal_camera_default gxp_device:chr_file rw_file_perms;
# Allow creating dump files for debugging in non-release builds # Allow creating dump files for debugging in non-release builds
userdebug_or_eng(` userdebug_or_eng(`
allow hal_camera_default vendor_camera_data_file:dir create_dir_perms; allow hal_camera_default vendor_camera_data_file:dir create_dir_perms;