Merge "whitechapel: make vframe-secure a system heap" into sc-dev

This commit is contained in:
TreeHugger Robot 2021-06-04 18:02:34 +00:00 committed by Android (Google) Code Review
commit aa7a8405e2
4 changed files with 2 additions and 6 deletions

View file

@ -45,9 +45,6 @@ type sensor_direct_heap_device, dmabuf_heap_device_type, dev_type;
#faceauth DMA-BUF heaps #faceauth DMA-BUF heaps
type faceauth_heap_device, dmabuf_heap_device_type, dev_type; type faceauth_heap_device, dmabuf_heap_device_type, dev_type;
#vframe-secure DMA-BUF heap
type vframe_heap_device, dmabuf_heap_device_type, dev_type;
#vscaler-secure DMA-BUF heap #vscaler-secure DMA-BUF heap
type vscaler_heap_device, dmabuf_heap_device_type, dev_type; type vscaler_heap_device, dmabuf_heap_device_type, dev_type;

View file

@ -440,7 +440,7 @@
/dev/dma_heap/farawimg-secure u:object_r:faceauth_heap_device:s0 /dev/dma_heap/farawimg-secure u:object_r:faceauth_heap_device:s0
# vframe-secure DMA-BUF heap # vframe-secure DMA-BUF heap
/dev/dma_heap/vframe-secure u:object_r:vframe_heap_device:s0 /dev/dma_heap/vframe-secure u:object_r:dmabuf_system_secure_heap_device:s0
# vscaler-secure DMA-BUF heap # vscaler-secure DMA-BUF heap
/dev/dma_heap/vscaler-secure u:object_r:vscaler_heap_device:s0 /dev/dma_heap/vscaler-secure u:object_r:vscaler_heap_device:s0

View file

@ -1,4 +1,4 @@
allow hal_graphics_allocator_default sensor_direct_heap_device:chr_file r_file_perms; allow hal_graphics_allocator_default sensor_direct_heap_device:chr_file r_file_perms;
allow hal_graphics_allocator_default faceauth_heap_device:chr_file r_file_perms; allow hal_graphics_allocator_default faceauth_heap_device:chr_file r_file_perms;
allow hal_graphics_allocator_default vframe_heap_device:chr_file r_file_perms; allow hal_graphics_allocator_default dmabuf_system_secure_heap_device:chr_file r_file_perms;
allow hal_graphics_allocator_default vscaler_heap_device:chr_file r_file_perms; allow hal_graphics_allocator_default vscaler_heap_device:chr_file r_file_perms;

View file

@ -7,4 +7,3 @@ allow mediacodec hal_camera_default:binder call;
allow mediacodec sysfs_video:file r_file_perms; allow mediacodec sysfs_video:file r_file_perms;
allow mediacodec sysfs_video:dir r_dir_perms; allow mediacodec sysfs_video:dir r_dir_perms;
allow mediacodec dmabuf_system_secure_heap_device:chr_file r_file_perms; allow mediacodec dmabuf_system_secure_heap_device:chr_file r_file_perms;
allow mediacodec vframe_heap_device:chr_file r_file_perms;