[Bugfix][API-1099]occasionally,setup data call fail,due to tele-fwk can not get mccmnc <new solution> 2
Change-Id: Icc7eaf14cccba0242ac5b75160ed7e8c2e331847
(cherry picked from commit c82e309b09383748d837c06e9a556d83ac56ebcd)
(cherry picked from commit 594edd999d711f961fc80ce7b292209e45a6997b)
diff --git a/src/lynq/lib/liblynq-data/lynq_data.cpp b/src/lynq/lib/liblynq-data/lynq_data.cpp
index 55b2308..735e7e2 100755
--- a/src/lynq/lib/liblynq-data/lynq_data.cpp
+++ b/src/lynq/lib/liblynq-data/lynq_data.cpp
@@ -1738,18 +1738,6 @@
lynq_client_t client;
char argc[512];
int res = -1;
- int count = 0;
- while(count < 10)
- {
- res = get_imsi();
- if(res==0)
- {
- break;
- }
- sleep(1);
- count++;
- }
- LYINFLOG("[%s] count is %d",__FUNCTION__,count);
if (cmd == 0) // insert apn db
{
res = insert_apn_char(argc, id, mcc, mnc, apn, apntype, user, password, normalprotocol, roamingprotocol, carrier);
diff --git a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/apn/RpApnController.cpp b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/apn/RpApnController.cpp
index e5ed57e..1deddf0 100755
--- a/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/apn/RpApnController.cpp
+++ b/src/telephonyware/3.0/libvendor-ril/mtk-rilproxy/telephony/apn/RpApnController.cpp
@@ -339,8 +339,8 @@
property_get(mccMncKey, mccmncvalue,"");
getStatusManager(i)->setString8Value(RFX_STATUS_KEY_GSM_OPERATOR_NUMERIC, String8(mccmncvalue));
logD(RFX_LOG_TAG, "[reloadApnDB]mccmnc: %s",mccmncvalue);
- mccmnc = getStatusManager(i)->getString8Value(RFX_STATUS_KEY_GSM_OPERATOR_NUMERIC, String8(""));
*/
+ mccmnc = getStatusManager(i)->getString8Value(RFX_STATUS_KEY_GSM_OPERATOR_NUMERIC, String8(""));
if (!mccmnc.isEmpty()) {
logD(RFX_LOG_TAG, "[reloadApnDB]start: %d, dataController->getApnReady() =%d", i, dataController->getApnReady());
int count = 0;