commit d42a8b29f460ca3ee1fa2d7ba2947a0bce7c15e5
author lh <lh@exm.com> Tue Jul 18 17:13:53 2023 +0800
committer Gerrit Code Review <jenkins2@jenkins2-Vostro-3690> Tue Jul 18 17:13:53 2023 +0800
tree ce27e9dd824b29a73b225ca3deb56c9709b8ef5c
parent e6964e0721ca981fde9a6170883904d068d147bf
parent cec0681e74a29280c190b0f32590eda60572fb96

Merge "[Bugfix][API-1123][DATA] data call deact apn failed for mRefCount = 0" into MR3.0-merge

src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/data/DcTracker.cpp

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
old mode 100644
new mode 100755
index f92fd54..7c643eb
--- 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
@@ -240,7 +240,8 @@
     } else {
         apnContext->decRefCount();
         RFX_LOG_D(RFX_LOG_TAG, "deactiveNetwork with apnType: %s is using, ignore this request!!!", requestApn.c_str());
-         apnContext->notifyStateChange(RIL_Data_Call_PdnState::PDN_DISCONNECTED);
+         //apnContext->notifyStateChange(RIL_Data_Call_PdnState::PDN_DISCONNECTED);
+         apnContext->notifyStateChange(apnContext->getState());
     }
 }
 
@@ -1078,7 +1079,7 @@
 
             RFX_LOG_D(RFX_LOG_TAG, "onSetupConnectionCompleted, clear up the pdn connection with apn type: %s",
                             apnContext->getApnType().c_str());
-            apnContext->setSate(RIL_Data_Call_PdnState::PDN_FAILED);
+            //apnContext->setSate(RIL_Data_Call_PdnState::PDN_FAILED);
             apnContext->getApnSetting().clear();
             dataConnection->updateCompatibleApnContexts(apnContext);