[Feature][T8TSK-136][AT]About synchronizing the upgrade of the at data module
Change-Id: I831939a09d0eff12b5c1e6e374e14da2b778eb3f
diff --git a/framework/lynq-ril-service/src/data/data_gdbus.cpp b/framework/lynq-ril-service/src/data/data_gdbus.cpp
index 03b43dd..10dd452 100755
--- a/framework/lynq-ril-service/src/data/data_gdbus.cpp
+++ b/framework/lynq-ril-service/src/data/data_gdbus.cpp
@@ -48,6 +48,10 @@
#include "lynq_common.h"
#include "lynq_interface.h"
#include <binder/Parcel.h>
+#include "ATCI.h"
+#ifdef LED_SUPPORT
+#include "led.h"
+#endif
using android::Parcel;
/*Warren add for t800 ril service 2021/12/25 end*/
@@ -90,11 +94,11 @@
{
if(pdnState==PDN_CONNECTED)
{
- lynq_output_info("+LAPNST:%s,%s,%d,%s,%s\n",apn,apntype,pdnState,ifname,addresses);
+ printf("+LAPNST:%s,%s,%d,%s,%s\n",apn,apntype,pdnState,ifname,addresses);
}
else
{
- lynq_output_info("+LAPNST:%s,%s,%d\n",apn,apntype,pdnState);
+ printf("+LAPNST:%s,%s,%d\n",apn,apntype,pdnState);
}
return 0;
}
@@ -121,7 +125,7 @@
for(int i = 0;i < LYNQ_APN_CHANNEL_MAX;i++)
{
#if DEBUG
- lynq_output_info("line %d [PDN_DISCONNECTED]apn_table[%d],apntype:%s,apnstatus:%d,,,urc_response->apnName:%s\n",__LINE__, i,apn_table[i].apntype,apn_table[i].apnstatus,urc_response->apnType);
+ printf("line %d [PDN_DISCONNECTED]apn_table[%d],apntype:%s,apnstatus:%d,,,urc_response->apnName:%s\n",__LINE__, i,apn_table[i].apntype,apn_table[i].apnstatus,urc_response->apnType);
#endif
RLOGD("[PDN_DISCONNECTED]apn_table[%d],apntype:%s,apnstatus:%d,,,urc_response->apnName:%s\n",i,apn_table[i].apntype,apn_table[i].apnstatus,urc_response->apnType);
if((strcmp(apn_table[i].apntype,urc_response->apnType)==0)&&(apn_table[i].apnstatus==0))
@@ -132,7 +136,7 @@
apn_table[i].netId = 0;
apn_table[i].pdpstate = PDN_DISCONNECTED;
apn_count--;
- lynq_output_info("\nOK\n");
+ printf("\nOK\n");
p.writeInt32 (1);
p.writeInt32 (LYNQ_URC_DATA_CALL_STATUS_IND);
p.writeInt32 (0);//temporary plan
@@ -164,7 +168,7 @@
memcpy(apn_table[apn_count].address,urc_response->addresses,strlen(urc_response->addresses)+1);
apn_table[apn_count].pdpstate = urc_response->pdnState;
#if DEBUG
- lynq_output_info("line %d apn_table[%d].apn:%s,apntype:%s,,,urc_response->apnName:%s,urc_response->apntype:%s\n",__LINE__,apn_count,apn_table[apn_count].apn,apn_table[apn_count].apntype,urc_response->apnName,urc_response->apnType);
+ printf("line %d apn_table[%d].apn:%s,apntype:%s,,,urc_response->apnName:%s,urc_response->apntype:%s\n",__LINE__,apn_count,apn_table[apn_count].apn,apn_table[apn_count].apntype,urc_response->apnName,urc_response->apnType);
#endif
RLOGD("apn_table[%d].apn:%s,apntype:%s,,,urc_response->apnName:%s,urc_response->apntype:%s\n",apn_count,apn_table[apn_count].apn,apn_table[apn_count].apntype,urc_response->apnName,urc_response->apnType);
apn_table[apn_count].apnstatus=1;
@@ -186,20 +190,20 @@
for(int i = 0;i < LYNQ_APN_CHANNEL_MAX;i++)//means apn state changed,need update
{
#if DEBUG
- lynq_output_info("line %d for apn_table[%d].apn:%s,,,,urc_response->apnName:%s\n",__LINE__,i,apn_table[i].apn,urc_response->apnName);
+ printf("line %d for apn_table[%d].apn:%s,,,,urc_response->apnName:%s\n",__LINE__,i,apn_table[i].apn,urc_response->apnName);
#endif
RLOGD("for apn_table[%d].apn:%s,,,,urc_response->apnName:%s\n",i,apn_table[i].apn,urc_response->apnName);
if(strcmp(apn_table[i].apn,urc_response->apnName)==0)
{
#if DEBUG
- lynq_output_info("line %d This apn has been created update???!!!\n",__LINE__);
+ printf("line %d This apn has been created update???!!!\n",__LINE__);
#endif
RLOGD("This apn has been created!!!");
apnHasCreated = TRUE;
if(apn_table[i].netId!=urc_response->netId)
{
#if DEBUG
- lynq_output_info("update???\n");
+ printf("update???\n");
#endif
apn_table[i].netId = urc_response->netId;
apn_table[i].pdpstate = urc_response->pdnState;
@@ -239,7 +243,7 @@
if(getLable)
{
#if DEBUG
- lynq_output_info("line %d Multiple APNs are established\n", __LINE__);
+ printf("line %d Multiple APNs are established\n", __LINE__);
#endif
RLOGD("[getLable]:label==%d\n",lable);
memcpy(apn_table[lable].apn,urc_response->apnName,strlen(urc_response->apnName)+1);
@@ -280,7 +284,7 @@
for(i;i < LYNQ_APN_CHANNEL_MAX;i++)
{
#if DEBUG
- lynq_output_info("line %d don't know\n", __LINE__);
+ printf("line %d don't know\n", __LINE__);
#endif
RLOGD("[cid<0]apn_table[%d].apntype:%s,,,,urc_response->apntype:%s\n",i,apn_table[i].apntype,urc_response->apnType);
if(strcmp(apn_table[i].apntype,urc_response->apnType)==0)
@@ -293,7 +297,7 @@
if(apnHasCreated)
{
#if DEBUG
- lynq_output_info("line %d don't know\n", __LINE__);
+ printf("line %d don't know\n", __LINE__);
#endif
apn_table[i].pdpstate = urc_response->pdnState;
char ptr[1] = "";
@@ -438,9 +442,11 @@
RLOGD("modifyApnDB_method_cb reason %s", ((reason == NULL)? "":reason));
printf("modify apn db success, return message: %s\n", ((reason == NULL)? "":reason));
//printf("modifyApnDB_method_cb reason %s\n", ((reason == NULL)? "":reason));
- /*lei add for at+lmdapn*/
- lynq_output_info("+LEAPNMOD:%s\n", ((reason == NULL)? "":reason));
- /*lei add for at+lmdapn*/
+ /*lei add for AT+LEAPNMOD*/
+ char apn_buf[1024];
+ sprintf(apn_buf, "+LEAPNMOD:%s", ((reason == NULL)? "":reason));
+ ATCIResponseNoToken(0, apn_buf, 666);//tmp plan
+ /*lei add for AT+LEAPNMOD*/
g_variant_unref(result);
lynq_data_modify_apn(reason,LYNQ_URC_MODIFY_APNDB);
}