diff options
| author | sbrissen <sbrissen@hotmail.com> | 2015-11-12 08:05:26 -0500 |
|---|---|---|
| committer | sbrissen <sbrissen@hotmail.com> | 2015-11-12 08:05:26 -0500 |
| commit | 96b9246e1f6207cb231ebfa334101e0cec33b6bf (patch) | |
| tree | 82c083ab6276d248ffc8e516176ca39d2ccccee1 /selinux | |
| parent | 8c9baef78e9aa0c0727709537c2b46e431338826 (diff) | |
| download | device_samsung_kona-common-96b9246e1f6207cb231ebfa334101e0cec33b6bf.zip device_samsung_kona-common-96b9246e1f6207cb231ebfa334101e0cec33b6bf.tar.gz device_samsung_kona-common-96b9246e1f6207cb231ebfa334101e0cec33b6bf.tar.bz2 | |
kona-common: fix mismerge/build issue
Change-Id: I28e6e0b6dac128d03bde95b3bba4fb94e337cb40
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/init.te | 2 | ||||
| -rw-r--r-- | selinux/system_app.te | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/selinux/init.te b/selinux/init.te index aac9a68..d231f03 100644 --- a/selinux/init.te +++ b/selinux/init.te @@ -4,4 +4,4 @@ allow init init:tcp_socket { read write create }; allow init port:tcp_socket name_connect; allow init self:tcp_socket { read write getopt connect }; allow init kernel:system syslog_read; -allow init system_file:file execute_no_trans; +#allow init system_file:file execute_no_trans; diff --git a/selinux/system_app.te b/selinux/system_app.te index ef29468..2e162b8 100644 --- a/selinux/system_app.te +++ b/selinux/system_app.te @@ -1,6 +1,2 @@ allow system_app log_device:chr_file write; -<<<<<<< HEAD -allow system_app sysfs:file write; -======= # allow system_app sysfs:file write; ->>>>>>> c4949ef... kona-common : update selinux 2 |