am c609d527: am eb47925d: Merge "Drop restorecons from init.deb.rc file."

* commit 'c609d527ddb60c125ea496c1fa176a5b6f7c962b':
  Drop restorecons from init.deb.rc file.
This commit is contained in:
Nick Kralevich 2014-02-28 20:45:27 +00:00 committed by Android Git Automerger
commit f87af999ff

View file

@ -122,7 +122,6 @@ on boot
# 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
@ -137,10 +136,6 @@ on boot
# msm specific files that need to be created on /data
on post-fs-data
mkdir /data/media 0770 media_rw media_rw
restorecon_recursive /data/media
# Apply correct labeling to DRM files
restorecon_recursive /data/misc/playready
chown system system /dev/wcnss_wlan
write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
@ -157,7 +152,6 @@ on post-fs-data
# Create directory used by audio subsystem
mkdir /data/misc/audio 0770 audio audio
restorecon_recursive /data/misc/audio
# Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections
# We chown/chmod /persist again so because mount is run as root + defaults
@ -180,21 +174,16 @@ on post-fs-data
#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
@ -212,9 +201,6 @@ on post-fs-data
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