Merge changes from topic 'fc_sort-2'
* changes:
fc_sort: initial commit
checkfc: do not die on 0 length fc's
diff --git a/adbd.te b/adbd.te
index 3807c58..76a0feb 100644
--- a/adbd.te
+++ b/adbd.te
@@ -52,10 +52,6 @@
# Run /system/bin/bu
allow adbd system_file:file rx_file_perms;
-# XXX Run toolbox. Might not be needed.
-allow adbd toolbox_exec:file rx_file_perms;
-auditallow adbd toolbox_exec:file rx_file_perms;
-
# Perform binder IPC to surfaceflinger (screencap)
# XXX Run screencap in a separate domain?
binder_use(adbd)
diff --git a/netd.te b/netd.te
index 564e91e..0f4e891 100644
--- a/netd.te
+++ b/netd.te
@@ -20,9 +20,6 @@
allow netd self:netlink_socket create_socket_perms;
allow netd shell_exec:file rx_file_perms;
allow netd system_file:file x_file_perms;
-# XXX Run toolbox. Might not be needed.
-allow netd toolbox_exec:file rx_file_perms;
-auditallow netd toolbox_exec:file rx_file_perms;
allow netd devpts:chr_file rw_file_perms;
# For /proc/sys/net/ipv[46]/route/flush.
diff --git a/ppp.te b/ppp.te
index 58b640a..d7ed70d 100644
--- a/ppp.te
+++ b/ppp.te
@@ -11,9 +11,6 @@
allow ppp ppp_device:chr_file rw_file_perms;
allow ppp self:capability net_admin;
allow ppp system_file:file rx_file_perms;
-# XXX Run toolbox. Might not be needed.
-allow ppp toolbox_exec:file rx_file_perms;
-auditallow ppp toolbox_exec:file rx_file_perms;
allow ppp vpn_data_file:dir w_dir_perms;
allow ppp vpn_data_file:file create_file_perms;
allow ppp mtp:fd use;
diff --git a/racoon.te b/racoon.te
index 1a2e546..bf272d1 100644
--- a/racoon.te
+++ b/racoon.te
@@ -19,9 +19,6 @@
# XXX: should we give ip-up-vpn its own label (currently racoon domain)
allow racoon system_file:file rx_file_perms;
-# XXX Run toolbox. Might not be needed.
-allow racoon toolbox_exec:file rx_file_perms;
-auditallow racoon toolbox_exec:file rx_file_perms;
allow racoon vpn_data_file:file create_file_perms;
allow racoon vpn_data_file:dir w_dir_perms;