From 8393d4b85363751fcc771959748c196bc5bc3c52 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Tue, 13 May 2014 10:31:14 -0700
Subject: [PATCH] DO NOT MERGE: remove duplicate rules.
klp-modular-dev-plus-aosp has duplicate SELinux rules in
system_server, which don't appear in AOSP or master. Delete
those duplicate rules, as they just make resolving merge
conflicts more difficult.
Change-Id: I0eaae453b887d08bddf16f963cef4c099fe2e9a6
---
system_server.te | 3 ---
1 file changed, 3 deletions(-)
diff --git a/system_server.te b/system_server.te
index 604a576ff..f5b14e221 100644
--- a/system_server.te
+++ b/system_server.te
@@ -67,9 +67,6 @@ allow system_server self:netlink_kobject_uevent_socket create_socket_perms;
# Use generic netlink sockets.
allow system_server self:netlink_socket create_socket_perms;
-# Use generic netlink sockets.
-allow system_server self:netlink_socket create_socket_perms;
-
# Kill apps.
allow system_server appdomain:process { sigkill signal };
--
GitLab