[Bugfix]API-62 fix
Change-Id: I182f062f9ece5e58020c668a0d9796a0c5216e59
diff --git a/src/lynq/lib/liblynq-network/lynq_network.cpp b/src/lynq/lib/liblynq-network/lynq_network.cpp
index bbb7889..3ef9d70 100755
--- a/src/lynq/lib/liblynq-network/lynq_network.cpp
+++ b/src/lynq/lib/liblynq-network/lynq_network.cpp
@@ -123,7 +123,10 @@
}else{
urc_solSigStren.gw_sig_valid = 0;
}
-
+ if(urc_solSigStren.gw_sig_valid == 1)
+ {
+ LYINFLOG("urc_GSM_signalstrength:%d",urc_solSigStren.rssi);
+ }
urc_p->readInt32(&none);
urc_p->readInt32(&none);
urc_p->readInt32(&none);
@@ -136,13 +139,16 @@
urc_p->readInt32(&urc_solSigStren.rsrp);
urc_p->readInt32(&urc_solSigStren.rsrq);
urc_p->readInt32(&urc_solSigStren.rssnr);
- LYINFLOG("urc_LTE_signalstrength:%d",urc_LTE_signalstrength);
if((urc_LTE_signalstrength!=99)&&(urc_LTE_signalstrength!=0))
{
urc_solSigStren.lte_sig_valid = 1;
}else{
urc_solSigStren.lte_sig_valid = 0;
}
+ if(urc_solSigStren.lte_sig_valid == 1)
+ {
+ LYINFLOG("urc_LTE_signalstrength:%d",urc_LTE_signalstrength);
+ }
urc_p->readInt32(&none);
urc_p->readInt32(&none);
@@ -153,12 +159,15 @@
urc_p->readInt32(&none);
urc_p->readInt32(&urc_solSigStren.rscp);
urc_p->readInt32(&urc_solSigStren.ecno);
- LYINFLOG("urc_WCDMA_signalstrength:%d",urc_WCDMA_signalstrength);
if((urc_WCDMA_signalstrength!=99)&&(urc_WCDMA_signalstrength!=0))
{
- urc_solSigStren.lte_sig_valid = 1;
+ urc_solSigStren.wcdma_sig_valid = 1;
}else{
- urc_solSigStren.lte_sig_valid = 0;
+ urc_solSigStren.wcdma_sig_valid = 0;
+ }
+ if(urc_solSigStren.wcdma_sig_valid == 1)
+ {
+ LYINFLOG("urc_WCDMA_signalstrength:%d",urc_WCDMA_signalstrength);
}
urc_p->readInt32(&urc_solSigStren.ssRsrp);
urc_p->readInt32(&urc_solSigStren.ssRsrq);
@@ -172,7 +181,13 @@
{
urc_solSigStren.nr_sig_valid = 1;
}else{
- LYERRLOG("None of NR signal info");
+ urc_solSigStren.nr_sig_valid = 0;
+ }
+ if(urc_solSigStren.nr_sig_valid == 1)
+ {
+ LYINFLOG("[NR signal]ssRsrp is %d , ssRsrq is %d , ssSinr is %d , csiRsrp is %d , csiRsrq is %d , csiSinr is %d",\
+ urc_solSigStren.ssRsrp,urc_solSigStren.ssRsrq,urc_solSigStren.ssSinr, \
+ urc_solSigStren.csiRsrp,urc_solSigStren.csiRsrq,urc_solSigStren.csiSinr);
}
}
}
@@ -520,8 +535,12 @@
int lynq_set_network_selection_mode(const char *mode,const char* mccmnc)
{
int ret = -1;
- if(NULL == mode ||NULL == mccmnc)
+ if(NULL == mode)
return ret;
+ if(strlen(mode) == 0)
+ {
+ return ret;
+ }
int send_num = 0;
lynq_client_t client_t;
int recv_num = 0;
@@ -534,6 +553,16 @@
client_t.uToken = Global_uToken;
memset(client_t.param,0,sizeof(client_t.param));
}else if(!strcmp(mode,"Manual")){
+ if(mccmnc == NULL)
+ {
+ LYERRLOG("mccmnc is NULL!!!");
+ return ret;
+ }
+ if(strlen(mccmnc) == 0)
+ {
+ LYERRLOG("mccmnc strlen is 0!!!");
+ return ret;
+ }
client_t.request = RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL;
client_t.paramLen = 1;
client_t.uToken = Global_uToken;
@@ -1003,7 +1032,7 @@
LYERRLOG("recvfrom error");
return -1;
}
- for(int i = 0;i<20;i++)
+ for(int i = 0;i<10;i++)
{
availBanMode[i]=0;
}