[Bugfix][API-1250]tele-fwk crashes, causing the status not to be reported
Only Configure：No
Affected branch：GSW3.0-No-Connman
Affected module: tele-fwk
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I954d5db9b8781cf5ae547de8f9f04d5d3a1b8b9b
diff --git a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/ApnContext.cpp b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/ApnContext.cpp
index 3d2f26f..4cb9bd2 100644
--- a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/ApnContext.cpp
+++ b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/ApnContext.cpp
@@ -290,7 +290,8 @@
mApnType.c_str(), RpDataUtils::apnState2string(newState), RpDataUtils::requestOrUrcToString(response->getId()));
// no need config the network for DEFAULT pdn.
- if (ApnContext::mApnType != TEXT_APN_TYPE_DEFAULT) {
+ //if (ApnContext::mApnType != TEXT_APN_TYPE_DEFAULT) {
+ if (ApnContext::mApnType != TEXT_APN_TYPE_DEFAULT && ApnContext::mApnType != TEXT_IOT_APN_TYPE_DEFAULT) {
RpDataUtils::configNetwork(dcResponse.netId, dcResponse.ifname, dcResponse.gateways, dcResponse.dnses);
}
@@ -311,9 +312,9 @@
mApnType.c_str(), RpDataUtils::apnState2string(newState), RpDataUtils::requestOrUrcToString(urc->getId()));
// no need config the network for DEFAULT pdn.
- if (ApnContext::mApnType != TEXT_APN_TYPE_DEFAULT) {
- RpDataUtils::configNetwork(dcResponse.netId, dcResponse.ifname, dcResponse.gateways, dcResponse.dnses);
- }
+ //if (ApnContext::mApnType != TEXT_APN_TYPE_DEFAULT) {
+ //RpDataUtils::configNetwork(dcResponse.netId, dcResponse.ifname, dcResponse.gateways, dcResponse.dnses);
+ //}
ApnContext::mRpDataController->notifyWorld(urc);
}
diff --git a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
index c32b7a6..640cff1 100755
--- a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
+++ b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp
@@ -1111,10 +1111,10 @@
} else {
// no need config the network for DEFAULT pdn.
- if (apnContext->getApnType()!= TEXT_APN_TYPE_DEFAULT) {
- RpDataUtils::configNetwork(dataCallResponse.netId, dataCallResponse.ifname,
- dataCallResponse.addresses, dataCallResponse.dnses);
- }
+ //if (apnContext->getApnType()!= TEXT_APN_TYPE_DEFAULT) {
+ //RpDataUtils::configNetwork(dataCallResponse.netId, dataCallResponse.ifname,
+ //dataCallResponse.addresses, dataCallResponse.dnses);
+ //}
apnContext->setSate(RIL_Data_Call_PdnState::PDN_CONNECTED);
dataConnection->updateCompatibleApnContexts(apnContext);
dataConnection->setcId(dataCallResponse.cid);