Merge "Move rild to vendor partition."

private/file_contexts

@@ -187,7 +187,6 @@
 /system/bin/vold	u:object_r:vold_exec:s0
 /system/bin/netd	u:object_r:netd_exec:s0
 /system/bin/wificond	u:object_r:wificond_exec:s0
-/system/bin/rild	u:object_r:rild_exec:s0
 /system/bin/audioserver	u:object_r:audioserver_exec:s0
 /system/bin/mediadrmserver	u:object_r:mediadrmserver_exec:s0
 /system/bin/mediaserver	u:object_r:mediaserver_exec:s0

public/rild.te

 # rild - radio interface layer daemon
 type rild, domain, domain_deprecated;
 hal_impl_domain(rild, hal_telephony)
-type rild_exec, exec_type, file_type;
 
 net_domain(rild)
 allowxperm rild self:udp_socket ioctl priv_sock_ioctls;

vendor/file_contexts

@@ -21,6 +21,7 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.0-service            u:object_r:hal_nfc_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.power@1\.0-service          u:object_r:hal_power_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.sensors@1\.0-service        u:object_r:hal_sensors_default_exec:s0
+/(vendor|system/vendor)/bin/hw/rild                                           u:object_r:rild_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@1\.0-service        u:object_r:hal_thermal_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.0-service            u:object_r:hal_usb_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator@1\.0-service       u:object_r:hal_vibrator_default_exec:s0

private/rild.te → vendor/rild.te

 # type_transition must be private policy the domain_trans rules could stay
 # public, but conceptually should go with this
+type rild_exec, exec_type, file_type;
 init_daemon_domain(rild)