am 2c0c4dce: am c7c78b0c: Merge "Allow kickstart_checker.sh to run in system group."
* commit '2c0c4dce2ed7698fcdffa843837758509ba16e69':
diff --git a/fstab.deb b/fstab.deb
index 0d0d263..a01c9a5 100644
--- a/fstab.deb
+++ b/fstab.deb
@@ -7,7 +7,7 @@
/dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,errors=panic wait,check
/dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,errors=panic wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/metadata
/dev/block/platform/msm_sdcc.1/by-name/persist /persist ext4 nosuid,nodev,barrier=1,data=ordered,nodelalloc wait
-/dev/block/platform/msm_sdcc.1/by-name/radio /firmware vfat ro,uid=1000,gid=1000,fmask=0337,dmask=0227,iocharset=iso8859-1,shortname=mixed,errors=remount-ro wait
+/dev/block/platform/msm_sdcc.1/by-name/radio /firmware vfat ro,uid=1000,gid=1000,fmask=0337,dmask=0227,iocharset=iso8859-1,shortname=mixed,errors=remount-ro,context=u:object_r:radio_efs_file:s0 wait
/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults defaults
/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults
diff --git a/init.deb.rc b/init.deb.rc
index a60a257..b167eb5 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -120,7 +120,6 @@
# NFC: create data/nfc for nv storage
mkdir /data/nfc 770 nfc nfc
- restorecon_recursive /data/nfc
mkdir /data/nfc/param 770 nfc nfc
# Assign TCP buffer thresholds to be ceiling value of technology maximums
@@ -173,21 +172,16 @@
#Create directory used by sensor subsystem(dsps)
mkdir /data/system/sensors
chmod 775 /data/system/sensors
- restorecon_recursive /data/system/sensors
write /data/system/sensors/settings 1
chmod 660 /data/system/sensors/settings
# AKM setting data
mkdir /data/misc/sensors
chmod 775 /data/misc/sensors
- restorecon_recursive /data/misc/sensors
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
@@ -205,9 +199,6 @@
mkdir /data/qcks 0770 system system
chown system /dev/block/platform/msm_sdcc.1/by-name
- # Remove old socket so that it is re-created in the right context.
- rm /data/app/sensor_ctl_socket
-
setprop vold.post_fs_data_done 1
rm /data/local/tmp/adreno_config.txt
