prementive strike on merge conflicts
Fix file diffs.
Change-Id: Iac673c718b49779bba380e75ddd083caf6a2a1c3
diff --git a/ueventd.te b/ueventd.te
index d4c769f..6a44367 100644
--- a/ueventd.te
+++ b/ueventd.te
@@ -10,7 +10,7 @@
allow ueventd device:file create_file_perms;
allow ueventd device:chr_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_zram_uevent:file w_file_perms;
allow ueventd sysfs_type:{ file lnk_file } { relabelfrom relabelto setattr getattr };
diff --git a/vold.te b/vold.te
index 81ed18b..75b6f36 100644
--- a/vold.te
+++ b/vold.te
@@ -90,9 +90,6 @@
# XXX Label sysfs files with a specific type?
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;
# Run fsck in the fsck domain.