wifi - Remove init.qcom.wlan.sh and relative setting
ag/6722341 will set WLAN driver/FW when start legacy HAL.
The patch removes init.qcom.wlan.sh because it is not necessary
Bug: 127715974
Test: Property with wlan driver/FW version at enforcing mode:
It can be verified by the below command:
# adb shell getprop vendor.wlan.driver.version
# adb shell getprop vendor.wlan.firmware.version
Change-Id: Id94874cb96bc489a0f3eccfb97d780001b712330
diff --git a/device.mk b/device.mk
index b175402..9b1fe98 100755
--- a/device.mk
+++ b/device.mk
@@ -93,7 +93,6 @@
$(LOCAL_PATH)/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc \
$(LOCAL_PATH)/init.qcom.devstart.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.devstart.sh \
$(LOCAL_PATH)/init.qcom.ipastart.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.ipastart.sh \
- $(LOCAL_PATH)/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh \
$(LOCAL_PATH)/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
$(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh \
frameworks/native/services/vr/virtual_touchpad/idc/vr-virtual-touchpad-0.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/vr-virtual-touchpad-0.idc \
diff --git a/init.hardware.rc b/init.hardware.rc
index 522a8ff..2a45715 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -815,13 +815,6 @@
disabled
oneshot
-service vendor.wlan_sh /vendor/bin/init.qcom.wlan.sh
- class main
- user root
- group root
- disabled
- oneshot
-
service vendor.ipastart_sh /vendor/bin/init.qcom.ipastart.sh
class main
user system
@@ -851,10 +844,6 @@
on property:sys.vdso=32
write /sys/module/vdso/parameters/enable_64 0
-on property:wlan.driver.status=ok
- # Get the wlan driver/fw version
- start vendor.wlan_sh
-
# charger driver exposes now finer grain control, map demo mode to those properties
# demo mode can only be exit wipping data which will also reset the persist properties
on property:sys.retaildemo.enabled=1
diff --git a/init.qcom.wlan.sh b/init.qcom.wlan.sh
deleted file mode 100644
index 0d14fab..0000000
--- a/init.qcom.wlan.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /vendor/bin/sh
-
-wlan_driver_version=`cat /sys/kernel/wifi/wlan/driver_version`
-setprop vendor.wlan.driver.version "$wlan_driver_version"
-wlan_fw_version=`cat /sys/kernel/wifi/wlan/fw/0/version`
-setprop vendor.wlan.firmware.version "$wlan_fw_version"
