Merge "[Feature][ZXW-257]wifi status acquisition api added"
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index dcbb548..7aac6ff 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -119,13 +119,11 @@
pswan_secdns=`nv get $wan_if"_secdns"`
pswan_nm=`nv get $wan_if"_nm"`
-#xf.li@20240306 modify for [Bugfix][T106BUG-469]Fix the bug of probability datacall fail start
-# #ifconfig $wan_if down 2>>$test_log
-# ifconfig $wan_if $pswan_ip netmask 255.255.255.0 up 2>>$test_log
-# if [ $? -ne 0 ];then
-# echo "Error: ifconfig $wan_if $pswan_ip up failed." >> $test_log
-# fi
-#xf.li@20240306 modify for [Bugfix][T106BUG-469]Fix the bug of probability datacall fail end
+ #ifconfig $wan_if down 2>>$test_log
+ ifconfig $wan_if $pswan_ip netmask 255.255.255.0 up 2>>$test_log
+ if [ $? -ne 0 ];then
+ echo "Error: ifconfig $wan_if $pswan_ip up failed." >> $test_log
+ fi
pswan_pri=`nv get pswan_priority`
rt_num=`expr $pswan_pri \* 10 + $c_id`
diff --git a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
index 8ec3e52..f7c0954 100755
--- a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
+++ b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
@@ -1812,10 +1812,7 @@
//sprintf(cmd, "/sbin/wan_ipv4.sh \"linkup\" \"pswan\" \"%d\"", actinfo->c_id);
sprintf(cmd, "/sbin/wan_ipv4.sh linkup pswan %d", actinfo->c_id);
//zxic_system(cmd);
- //xf.li@20240314 modify for T106BUG-520 start
- //fpv4 = popen(cmd, "r");
- system_cmd_ex(cmd);
- //xf.li@20240314 modify for T106BUG-520 end
+ fpv4 = popen(cmd, "r");
}
if (actinfo->act_info.ip46flag == V6_VALID || actinfo->act_info.ip46flag == V46_VALID) {
@@ -1832,17 +1829,12 @@
//sprintf(cmd, "/sbin/wan_ipv6.sh \"linkup\" \"pswan\" \"%d\"", actinfo->c_id);
sprintf(cmd, "/sbin/wan_ipv6.sh linkup pswan %d", actinfo->c_id);
//zxic_system(cmd);
- //xf.li@20240314 modify for T106BUG-520 start
- //fpv6 = popen(cmd, "r");
- system_cmd_ex(cmd);
- //xf.li@20240314 modify for T106BUG-520 end
+ fpv6 = popen(cmd, "r");
}
- //xf.li@20240314 modify for T106BUG-520 start
- /*if(fpv4 != NULL)
+ if(fpv4 != NULL)
pclose(fpv4);
if(fpv6 != NULL)
- pclose(fpv6);*/
- //xf.li@20240314 modify for T106BUG-520 end
+ pclose(fpv6);
return 1;
}
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
index 472ca9b..a07030d 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
Binary files differ
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-customer/adb-login/files/adb_shell b/cap/zx297520v3/sources/meta-zxic-custom/recipes-customer/adb-login/files/adb_shell
index fd7f4cb..e63fdfe 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-customer/adb-login/files/adb_shell
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-customer/adb-login/files/adb_shell
@@ -1,2 +1,6 @@
#!/bin/sh
-/bin/sh
+if [ $1 = '-c' ];then
+ /bin/sh -c "$2"
+else
+ /bin/sh
+fi
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb/adb_shell b/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb/adb_shell
index fd7f4cb..e63fdfe 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb/adb_shell
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/adb/adb/adb_shell
@@ -1,2 +1,6 @@
#!/bin/sh
-/bin/sh
+if [ $1 = '-c' ];then
+ /bin/sh -c "$2"
+else
+ /bin/sh
+fi
diff --git a/update_version.sh b/update_version.sh
index f8cfb58..c25970f 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,8 +1,8 @@
#!/bin/bash
#export LYNQ_VERSION="T106_lynq_version_ap_build_sh"
-LYNQ_AP_VERSION="T106-V2.01.01.02P56U01.AP.12.03"
-LYNQ_CAP_INSIDE_VERSION="CAP.12.03"
-LYNQ_CAP_VERSION="CAP.12.03"
+LYNQ_AP_VERSION="T106-V2.01.01.02P56U01.AP.12.04"
+LYNQ_CAP_INSIDE_VERSION="CAP.12.04"
+LYNQ_CAP_VERSION="CAP.12.04"
COMMIT_ID="$(git rev-parse HEAD)"
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${LYNQ_AP_VERSION}_${LYNQ_CAP_INSIDE_VERSION}\""