Merge "[Bugfix][T106BUG-263] Fota upgrade success but boot failed not start original system"
diff --git a/ap/app/zte_comm/at_ctl/src/atctrl/at_rcvmsg.c b/ap/app/zte_comm/at_ctl/src/atctrl/at_rcvmsg.c
index d0afa68..0ca983b 100755
--- a/ap/app/zte_comm/at_ctl/src/atctrl/at_rcvmsg.c
+++ b/ap/app/zte_comm/at_ctl/src/atctrl/at_rcvmsg.c
@@ -1337,12 +1337,21 @@
}
if(ret < 0)
{/*дʧ°Ü·ÀֹͨµÀ¶ÂÈû*/
+//xf.li@20230930 modify for DRDI start
+#ifdef USE_CAP_SUPPORT
+ struct at_context * context = NULL;
+ if((context = at_context_find_ctx_by_fd_type(fd, AT_FWD_DOWN)) != 0){
+ char* err_str = at_err_build(ATERR_PROC_FAILED);
+ at_context_write_data(context->fwd_context->at_channel->at_fd, err_str,strlen(err_str));
+ free(err_str);
+ }
+#endif
rcv_at_rsp_handle(fd,"ERROR","",0,"",0);
- at_print(AT_ERR,"fwd_all_at_str write fail\n");
+ at_print(AT_ERR,"fwd_all_at_str write fail \n");
}
}
}
-
+//xf.li@20230930 modify for DRDI end
/*¶Ô½ÓÊÕµ½µÄATÃüÁî×Ö·û´®½øÐе¥¸ö×Ö·û´®´¦Àí ´¦Àí´Ó"at_recv_thread"Ï̴߳«À´µÄATͨµÀÏûÏ¢¡£¸ù¾Ý½ÓÊÕµ½µÄatÃüÁî×Ö·û´®£¬
×é×°ºÍÖØ×é³ÉÍêÕûµÄatÃüÁ²¢´¦Àí¡£*/
int rcv_at_str_proc(int at_fd, char *at_str, int at_len)
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
index 2b9df65..ee8b878 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
@@ -637,6 +637,12 @@
/* success or failure is ignored by the upper layer here.
it will call GET_CURRENT_CALLS and determine success that way */
RIL_onRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
+
+ //l.yang modify for bug id T106BUG-268 2023/9/28 start
+ at_response_free(p_response);
+ return;
+ //l.yang modify for bug id T106BUG-268 2023/9/28 end
+
//l.yang modify for bug id T106BUG-54 2023/9/20 start
error:
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
diff --git a/update_version.sh b/update_version.sh
index f20d3cb..c87df48 100644
--- 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="T106CN-ZS03.V2.01.01.02P50U04.AP.08.03"
-LYNQ_CAP_INSIDE_VERSION="CAP.08.03"
-LYNQ_CAP_VERSION="CAP.08.03"
+LYNQ_AP_VERSION="T106CN-ZS03.V2.01.01.02P50U04.AP.08.05"
+LYNQ_CAP_INSIDE_VERSION="CAP.08.05"
+LYNQ_CAP_VERSION="CAP.08.05"
COMMIT_ID="$(git rev-parse HEAD)"
LYNQ_SW_INSIDE_VERSION="LYNQ_CONFIG_VERSION = \"${LYNQ_AP_VERSION}_${LYNQ_CAP_INSIDE_VERSION}\""