merge in lmp-release history after reset to lmp-dev
diff --git a/device.mk b/device.mk
index e7d4da5..09d7ae2 100644
--- a/device.mk
+++ b/device.mk
@@ -57,8 +57,7 @@
PRODUCT_COPY_FILES += \
device/lge/mako/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
device/lge/mako/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
- device/lge/mako/WCNSS_qcom_wlan_nv.bin:system/etc/wifi/WCNSS_qcom_wlan_nv.bin \
- device/lge/mako/init.mako.wifi.sh:system/etc/init.mako.wifi.sh
+ device/lge/mako/WCNSS_qcom_wlan_nv.bin:system/etc/wifi/WCNSS_qcom_wlan_nv.bin
PRODUCT_COPY_FILES += \
device/lge/mako/audio_policy.conf:system/etc/audio_policy.conf
diff --git a/init.mako.rc b/init.mako.rc
index f84c0a9..85babc8 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -147,12 +147,16 @@
# to observe dnsmasq.leases file for dhcp information of soft ap.
chown dhcp system /data/misc/dhcp
- chown system system /dev/wcnss_wlan
+ write /dev/wcnss_wlan 1
write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
# Create directory used by audio subsystem
mkdir /data/misc/audio 0770 audio audio
+ # Workaround for conn_init not copying the updated firmware
+ rm /data/misc/wifi/WCNSS_qcom_cfg.ini
+ rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
+
# 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
chown system system /persist
@@ -231,9 +235,6 @@
write /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq 384000
write /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq 384000
- # disable diag port
- rm /dev/diag
-
on charger
# Enable Power modes and set the CPU Freq Sampling rates
write /sys/module/rpm_resources/enable_low_power/L2_cache 1
@@ -394,11 +395,10 @@
user camera
group camera system inet input
-service wcnss_init /system/bin/sh /system/etc/init.mako.wifi.sh
- class main
+service conn_init /system/bin/conn_init
+ class late_start
user system
group system wifi
- seclabel u:r:conn_init:s0
oneshot
service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
diff --git a/init.mako.wifi.sh b/init.mako.wifi.sh
deleted file mode 100644
index e586e96..0000000
--- a/init.mako.wifi.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-
-# Workaround for conn_init not copying the updated firmware
-rm /data/misc/wifi/WCNSS_qcom_cfg.ini
-rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
-
-/system/bin/conn_init
-
-echo 1 > /dev/wcnss_wlan
-
diff --git a/sepolicy/conn_init.te b/sepolicy/conn_init.te
index 6491888..33f0cab 100644
--- a/sepolicy/conn_init.te
+++ b/sepolicy/conn_init.te
@@ -2,11 +2,10 @@
type conn_init, domain;
type conn_init_exec, exec_type, file_type;
-init_daemon_domain(conn_init)
+# Started by logwrapper in init
+domain_auto_trans(init, conn_init_exec, conn_init)
-# Runs init.mako.wifi.sh
-allow conn_init shell_exec:file { entrypoint read };
-allow conn_init conn_init_exec:file rx_file_perms;
+allow conn_init devpts:chr_file { read write };
# Allow /persist/wifi access
allow conn_init { persist_file persist_wifi_file }:dir search;
@@ -15,8 +14,3 @@
# Allow /data/misc/wifi access for firmware files
allow conn_init wifi_data_file:dir w_dir_perms;
allow conn_init wifi_data_file:file create_file_perms;
-
-allow conn_init wlan_device:chr_file rw_file_perms;
-
-# init.mako.wifi.sh runs toolbox
-allow conn_init system_file:file execute_no_trans;
diff --git a/sepolicy/device.te b/sepolicy/device.te
index b6e993a..81caeca 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -1,5 +1,3 @@
-type wlan_device, dev_type;
-
type diag_device, dev_type;
# Kickstart device used by QC qcks
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 4944f75..ca7e215 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -2,9 +2,6 @@
/dev/kgsl-3d0 u:object_r:gpu_device:s0
/dev/kgsl u:object_r:gpu_device:s0
-# WLAN
-/dev/wcnss_wlan u:object_r:wlan_device:s0
-
# Image Rotator Driver
/dev/msm_rotator u:object_r:video_device:s0
