Merge commit '76428ec8349ae0d73455fa4b248bcc7375e08243' into HEAD
diff --git a/init.deb.rc b/init.deb.rc
index 45facba..3ee0703 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -43,6 +43,7 @@
on fs
mount_all ./fstab.flo
+ restorecon_recursive /persist
setprop ro.crypto.fuse_sdcard true
write /sys/kernel/boot_adsp/boot 1
@@ -187,6 +188,9 @@
mkdir /persist/sensors
chmod 775 /persist/sensors
+ # Label in case file already exists
+ restorecon /data/fdAlbum
+
# Modify from 777 (for camera calibration) to 775
chmod 775 /persist/camera_calibration
@@ -216,8 +220,7 @@
chown system system /sys/class/leds/white/device/blink
# communicate with mpdecision and thermald
- mkdir /dev/socket/mpdecision 0770 system system
- chmod 2770 /dev/socket/mpdecision
+ mkdir /dev/socket/mpdecision 2770 root system
# adjust vibrator amplitude
write /sys/class/timed_output/vibrator/amp 70
@@ -282,7 +285,7 @@
on property:init.svc.wpa_supplicant=stopped
stop dhcpcd
-service irsc_util /system/bin/logwrapper /system/bin/irsc_util "/etc/sec_config"
+service irsc_util /system/bin/irsc_util "/etc/sec_config"
class main
user root
oneshot
@@ -290,11 +293,13 @@
service rmt_storage /system/bin/rmt_storage
class main
user root
+ group system
service hciattach /system/bin/sh /system/etc/init.flo.bt.sh
class late_start
user bluetooth
group qcom_oncrpc bluetooth net_bt_admin system net_bt_stack
+ seclabel u:r:bluetooth_loader:s0
disabled
oneshot
@@ -317,6 +322,7 @@
service ks_checker /system/bin/sh /system/etc/kickstart_checker.sh
class core
+ seclabel u:r:kickstart:s0
oneshot
service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
@@ -342,13 +348,14 @@
service netmgrd /system/bin/netmgrd
class main
+ group radio
service sensors /system/bin/sensors.qcom
class late_start
user root
group root
-service wpa_supplicant /system/bin/logwrapper /system/bin/wpa_supplicant \
+service wpa_supplicant /system/bin/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
-O/data/misc/wifi/sockets \
@@ -362,7 +369,7 @@
disabled
oneshot
-service p2p_supplicant /system/bin/logwrapper /system/bin/wpa_supplicant \
+service p2p_supplicant /system/bin/wpa_supplicant \
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
-I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
@@ -426,6 +433,7 @@
service thermald /system/bin/thermald
class main
+ group radio
service mpdecision /system/bin/mpdecision --no_sleep --avg_comp
class main
@@ -434,7 +442,7 @@
class late_start
disabled
user system
- socket pps stream 0660 system system graphics
+ socket pps stream 0660 system system
group system graphics
service qcamerasvr /system/bin/mm-qcamera-daemon
@@ -446,6 +454,7 @@
class main
user system
group system wifi
+ seclabel u:r:conn_init:s0
oneshot
service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
@@ -467,7 +476,7 @@
user system
group system
-service diag_mdlog /system/bin/logwrapper /system/bin/diag_mdlog -s 100
+service diag_mdlog /system/bin/diag_mdlog -s 100
class late_start
disabled
