[Feature][ZXW-175]set the apntype as normal pdp flag
Only Configure: No
Affected branch: master
Affected module: data
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: Ic7de97859d24e74176dd9ab80a2f7f4352080646
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
index fbeaefe..71bc7f1 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
@@ -999,7 +999,7 @@
writeStringToParcel(p,password);
writeStringToParcel(p,authtype);
writeStringToParcel(p,pdp_type);//protocol == (ZXW)pdp_type
- if(strcmp(apn, "default") == 0)
+ if(strcmp(apntype, "iot_default") == 0 || strcmp(apntype, "default") == 0)
{
writeStringToParcel(p, normal_pdp);//((const char **)data)[7] set "2"，use normal_pdp datacall
RLOGD("setupDataCallargc:It is normal pdp data call");
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.cpp
index 8989350..b476b01 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.cpp
@@ -40,6 +40,7 @@
{-1, "", "", "", -1, -1, -1, ""}, \
{-1, "", "", "", -1, -1, -1, ""}, \
{-1, "", "", "", -1, -1, -1, ""}, \
+ {-1, "", "", "", -1, -1, -1, ""}, \
{-1, "", "", "", -1, -1, -1, ""},
};
#endif
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.h b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.h
index ff3dd2b..6d207d3 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.h
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/lynq_common.h
@@ -40,7 +40,7 @@
#define LYNQ_APNTPYE_LEN_MAX 50
#define LYNQ_IFNAME_LEN_MAX 10
#define LYNQ_ADDRESS_LEN_MAX 100
-#define LYNQ_APN_CHANNEL_MAX 7//max is 7
+#define LYNQ_APN_CHANNEL_MAX 8//max is 8
#define LYNQ_AT_LEN_MAX 20
#define LYNQ_EVENT_WAIT_TIME_MAX 25 //m
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
index 76f99b3..7646b20 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -4142,7 +4142,29 @@
errorOffset = p.dataPosition();
p.writeInt32 (e);
-
+ #ifdef MOBILETEK_TARGET_PLATFORM_T106
+ //xf.li@20231102 add for t106 data start
+ if(response == NULL && pRI->pCI->requestNumber == RIL_REQUEST_SETUP_DATA_CALL)
+ {
+ for(int j = 0; j < LYNQ_APN_CHANNEL_MAX; j++)
+ {
+ if(lynq_apn_cid_table[j].used == 1 && lynq_apn_cid_table[j].dialing == 1)
+ {
+ //delete
+ bzero(lynq_apn_cid_table[j].apn,LYNQ_APN_LEN_MAX);
+ bzero(lynq_apn_cid_table[j].apntype,LYNQ_APNTPYE_LEN_MAX);
+ bzero(lynq_apn_cid_table[j].ifaceName,LYNQ_IFNAME_LEN_MAX);
+ bzero(lynq_apn_cid_table[j].address,LYNQ_ADDRESS_LEN_MAX);
+ lynq_apn_cid_table[j].cid = -1;
+ lynq_apn_cid_table[j].used = -1;
+ lynq_apn_cid_table[j].status = -1;
+ lynq_apn_cid_table[j].dialing = -1;
+ break;
+ }
+ }
+ }
+ //xf.li@20231102 add for t106 data start
+ #endif
if (response != NULL) {
// there is a response payload, no matter success or not.
ret = pRI->pCI->responseFunction(p, response, responselen);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
index 49363ad..e7bda42 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
@@ -964,7 +964,7 @@
//xf.li@20230610 add for T106 data start
#ifdef MOBILETEK_TARGET_PLATFORM_T106
LYINFLOG("[%s][%d] call lynq_setup_data_call_sp",__FUNCTION__,__LINE__);
- error = lynq_setup_data_call_sp_t106(handle,"default","iot_default",NULL,NULL,NULL,NULL,NULL);
+ error = lynq_setup_data_call_sp_t106(handle,"default","default",NULL,NULL,NULL,NULL,NULL);
return error;
#else
//xf.li@20230610 add for T106 data end
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
old mode 100644
new mode 100755
index ddc89a9..c9c8304
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq_qser_data_apn.xml
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<lynq_qser_data_apn>
- <apn profile_idx="0" pdp_type="3" auth_proto="0" apn_name="default" username="NULL" password="NULL" apn_type="iot_default"/></lynq_qser_data_apn>
+ <apn profile_idx="0" pdp_type="3" auth_proto="0" apn_name="default" username="NULL" password="NULL" apn_type="default"/></lynq_qser_data_apn>