Skip to content
Snippets Groups Projects
Commit 1ac35736 authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by android-build-merger
Browse files

Merge "camera_device: remove type and add typealias" 

am: c15e1036

* commit 'c15e1036':
  camera_device: remove type and add typealias
parents af77ab6b c15e1036
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app.te
+ 1
− 1
View file @ 1ac35736
...@@ -243,7 +243,7 @@ neverallow appdomain dev_type:blk_file { read write }; ...@@ -243,7 +243,7 @@ neverallow appdomain dev_type:blk_file { read write };
# Access to any of the following character devices. # Access to any of the following character devices.
neverallow appdomain { neverallow appdomain {
audio_device audio_device
camera_device video_device
dm_device dm_device
radio_device radio_device
gps_device gps_device
......
device.te
+ 3
− 1
View file @ 1ac35736
...@@ -6,7 +6,6 @@ type ashmem_device, dev_type, mlstrustedobject; ...@@ -6,7 +6,6 @@ type ashmem_device, dev_type, mlstrustedobject;
type audio_device, dev_type; type audio_device, dev_type;
type binder_device, dev_type, mlstrustedobject; type binder_device, dev_type, mlstrustedobject;
type block_device, dev_type; type block_device, dev_type;
type camera_device, dev_type;
type dm_device, dev_type; type dm_device, dev_type;
type loop_device, dev_type; type loop_device, dev_type;
type pmsg_device, dev_type, mlstrustedobject; type pmsg_device, dev_type, mlstrustedobject;
...@@ -101,3 +100,6 @@ type misc_block_device, dev_type; ...@@ -101,3 +100,6 @@ type misc_block_device, dev_type;
# Bootctrl block device used by A/B update (update_engine, update_verifier). # Bootctrl block device used by A/B update (update_engine, update_verifier).
type bootctrl_block_device, dev_type; type bootctrl_block_device, dev_type;
# XXX: Temporarily alias camera_device for its removal
typealias video_device alias camera_device;
file_contexts
+ 1
− 1
View file @ 1ac35736
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
/dev/block/ram[0-9]* u:object_r:ram_device:s0 /dev/block/ram[0-9]* u:object_r:ram_device:s0
/dev/block/zram[0-9]* u:object_r:ram_device:s0 /dev/block/zram[0-9]* u:object_r:ram_device:s0
/dev/bus/usb(.*)? u:object_r:usb_device:s0 /dev/bus/usb(.*)? u:object_r:usb_device:s0
/dev/cam u:object_r:camera_device:s0 /dev/cam u:object_r:video_device:s0
/dev/console u:object_r:console_device:s0 /dev/console u:object_r:console_device:s0
/dev/cpuctl(/.*)? u:object_r:cpuctl_device:s0 /dev/cpuctl(/.*)? u:object_r:cpuctl_device:s0
/dev/device-mapper u:object_r:dm_device:s0 /dev/device-mapper u:object_r:dm_device:s0
......
mediaserver.te
+ 0
− 2
View file @ 1ac35736
...@@ -47,8 +47,6 @@ allow mediaserver radio_data_file:file { read getattr }; ...@@ -47,8 +47,6 @@ allow mediaserver radio_data_file:file { read getattr };
# Use pipes passed over Binder from app domains. # Use pipes passed over Binder from app domains.
allow mediaserver appdomain:fifo_file { getattr read write }; allow mediaserver appdomain:fifo_file { getattr read write };
# Access camera device.
allow mediaserver camera_device:chr_file rw_file_perms;
allow mediaserver rpmsg_device:chr_file rw_file_perms; allow mediaserver rpmsg_device:chr_file rw_file_perms;
# Inter System processes communicate over named pipe (FIFO) # Inter System processes communicate over named pipe (FIFO)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment