Skip to content
Snippets Groups Projects
Commit 2dc7a97e authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

Merge "prementive strike on merge conflicts" am: a073f5bf am: 95f1e2ea 

am: 776b8012

Change-Id: Ib03eef8d89a920d5780e35b0f2b1bdbd88d6602a
parents 125c0b44 776b8012
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ueventd.te
+ 1
− 1
View file @ 2dc7a97e
...@@ -10,7 +10,7 @@ allow ueventd self:capability { chown mknod net_admin setgid fsetid sys_rawio da ...@@ -10,7 +10,7 @@ allow ueventd self:capability { chown mknod net_admin setgid fsetid sys_rawio da
allow ueventd device:file create_file_perms; allow ueventd device:file create_file_perms;
allow ueventd device:chr_file rw_file_perms; allow ueventd device:chr_file rw_file_perms;
allow ueventd sysfs:file rw_file_perms; allow ueventd sysfs:file rw_file_perms;
allow ueventd sysfs_usb:file w_file_perms; allow ueventd sysfs_usb:file rw_file_perms;
allow ueventd sysfs_hwrandom:file w_file_perms; allow ueventd sysfs_hwrandom:file w_file_perms;
allow ueventd sysfs_zram_uevent:file w_file_perms; allow ueventd sysfs_zram_uevent:file w_file_perms;
allow ueventd sysfs_type:{ file lnk_file } { relabelfrom relabelto setattr getattr }; allow ueventd sysfs_type:{ file lnk_file } { relabelfrom relabelto setattr getattr };
......
vold.te
+ 0
− 3
View file @ 2dc7a97e
...@@ -90,9 +90,6 @@ allow vold self:capability { sys_ptrace kill }; ...@@ -90,9 +90,6 @@ allow vold self:capability { sys_ptrace kill };
# XXX Label sysfs files with a specific type? # XXX Label sysfs files with a specific type?
allow vold sysfs:file rw_file_perms; allow vold sysfs:file rw_file_perms;
# TODO: added to match above sysfs rule. Remove me?
allow vold sysfs_usb:file w_file_perms;
allow vold kmsg_device:chr_file rw_file_perms; allow vold kmsg_device:chr_file rw_file_perms;
# Run fsck in the fsck domain. # Run fsck in the fsck domain.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment