Merge "Make inputflinger enforcing."
diff --git a/clatd.te b/clatd.te
index 372cc2d..b0b5d95 100644
--- a/clatd.te
+++ b/clatd.te
@@ -23,4 +23,3 @@
allow clatd self:netlink_route_socket nlmsg_write;
allow clatd self:{ packet_socket rawip_socket tun_socket } create_socket_perms;
allow clatd tun_device:chr_file rw_file_perms;
-allow clatd proc_net:file rw_file_perms;;
diff --git a/property.te b/property.te
index 6f2b280..3195caf 100644
--- a/property.te
+++ b/property.te
@@ -14,6 +14,7 @@
type ctl_rildaemon_prop, property_type;
type ctl_bugreport_prop, property_type;
type audio_prop, property_type;
+type logd_prop, property_type;
type security_prop, property_type;
type bluetooth_prop, property_type;
type powerctl_prop, property_type;
diff --git a/property_contexts b/property_contexts
index cd8be69..4640d56 100644
--- a/property_contexts
+++ b/property_contexts
@@ -34,6 +34,7 @@
service.adb.tcp.port u:object_r:shell_prop:s0
persist.audio. u:object_r:audio_prop:s0
+persist.logd. u:object_r:logd_prop:s0
persist.sys. u:object_r:system_prop:s0
persist.service. u:object_r:system_prop:s0
persist.service.bdroid. u:object_r:bluetooth_prop:s0
diff --git a/runas.te b/runas.te
index 8cc0eea..1ce8e64 100644
--- a/runas.te
+++ b/runas.te
@@ -4,7 +4,8 @@
# ndk-gdb invokes adb shell run-as.
domain_auto_trans(shell, runas_exec, runas)
allow runas adbd:process sigchld;
-allow runas shell:fd use;
+allow runas shell:fd use;
+allow runas shell:fifo_file { read write };
allow runas devpts:chr_file { read write ioctl };
# run-as reads package information.
diff --git a/system_app.te b/system_app.te
index 42f7f7e..5b9f8a0 100644
--- a/system_app.te
+++ b/system_app.te
@@ -33,6 +33,7 @@
allow system_app radio_prop:property_service set;
allow system_app system_prop:property_service set;
allow system_app ctl_bugreport_prop:property_service set;
+allow system_app logd_prop:property_service set;
# Create /data/anr/traces.txt.
allow system_app anr_data_file:dir ra_dir_perms;
diff --git a/system_server.te b/system_server.te
index fc0da2b..ffed556 100644
--- a/system_server.te
+++ b/system_server.te
@@ -196,7 +196,7 @@
allow system_server dalvikcache_data_file:file create_file_perms;
# Read from /data/dalvik-cache/profiles
-allow system_server dalvikcache_profiles_data_file:dir w_dir_perms;
+allow system_server dalvikcache_profiles_data_file:dir rw_dir_perms;
allow system_server dalvikcache_profiles_data_file:file create_file_perms;
# Manage /data/misc/adb.