Merge "vendorsetup.sh: add Xiaomi HM1S/RedMI 1s" into lp5.1
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index db81bdd..901c994 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -20,8 +20,7 @@
 
 #############
 # Superuser's control sockets
-/dev/com.android.settings.daemon(/.*)?   u:object_r:superuser_device:s0
-/dev/com.android.settings(/.*)?   u:object_r:superuser_device:s0
+/dev/socket/su-daemon(/.*)?   u:object_r:superuser_device:s0
 
 # Expansion of these hooks is a bit unconventional
 /cache/com.cyanogenmod.keyhandler.dex   u:object_r:dalvikcache_data_file:s0
diff --git a/sepolicy/su.te b/sepolicy/su.te
index 76e4176..1113976 100644
--- a/sepolicy/su.te
+++ b/sepolicy/su.te
@@ -6,6 +6,8 @@
 
 userdebug_or_eng(`
   domain_trans(init, su_exec, sudaemon)
+
+  type_transition sudaemon socket_device:sock_file superuser_device;
   # The userspace app uses /dev sockets to control per-app access
   allow sudaemon superuser_device:dir { create rw_dir_perms setattr unlink };
   allow sudaemon superuser_device:sock_file { create setattr unlink write };