From 3b1ab2e8f66a1dc0c4cd6d4da474889311458e40 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Fri, 9 Sep 2016 23:09:45 -0700
Subject: [PATCH] prementive strike on merge conflicts
Fix file diffs.
Change-Id: Iac673c718b49779bba380e75ddd083caf6a2a1c3
---
ueventd.te | 2 +-
vold.te | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/ueventd.te b/ueventd.te
index d4c769f0f..6a44367ec 100644
--- a/ueventd.te
+++ b/ueventd.te
@@ -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: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 81ed18b55..75b6f3666 100644
--- a/vold.te
+++ b/vold.te
@@ -90,9 +90,6 @@ allow vold self:capability { sys_ptrace kill };
# 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.
--
GitLab