commit 83d48cb78024809ee903ebd6336e38724f18e5d7
author rjw <rjw@exm.com> Thu Jun 09 17:43:01 2022 +0800
committer rjw <rjw@exm.com> Fri Jun 24 13:58:35 2022 +0800
tree 4193e5513966fd04996314263caaa5d7738549c3
parent 50607f9d4fd7b05c75395f81e91acf5f4b5805d8

[Bugfix][API-193][Network]Fix incorrect CID parameter type

Change-Id: If472b07473d9ab77bb470f99ce7de7cbbcf613c3

src/lynq/lib/liblynq-network/include/lynq_network/lynq_network.h

diff --git a/src/lynq/lib/liblynq-network/include/lynq_network/lynq_network.h b/src/lynq/lib/liblynq-network/include/lynq_network/lynq_network.h
index bc12950..60c4ae2 100755
--- a/src/lynq/lib/liblynq-network/include/lynq_network/lynq_network.h
+++ b/src/lynq/lib/liblynq-network/include/lynq_network/lynq_network.h
@@ -60,7 +60,7 @@
 int lynq_query_registration_state(const char *type,int* regState,int* imsRegState,char * LAC,char * CID,int *netType,int *radioTechFam,int *netRejected);

 int lynq_query_prefferred_networktype(int *preNetType);

 int lynq_set_prefferred_networktype(const int preffertype);

-int lynq_query_cell_info(int cellinfo[CELLINFO_MAX_NUM],int tac[CELLINFO_MAX_NUM],int earfcn[CELLINFO_MAX_NUM],int * realNum);

+int lynq_query_cell_info(uint64_t cellinfo[CELLINFO_MAX_NUM],int tac[CELLINFO_MAX_NUM],int earfcn[CELLINFO_MAX_NUM],int * realNum);

 int lynq_set_unsol_cell_info_listrate(const int rate);

 int lynq_set_band_mode(const int bandmode);

 int lynq_query_available_bandmode(int availBanMode[]);

src/lynq/lib/liblynq-network/lynq_network.cpp

diff --git a/src/lynq/lib/liblynq-network/lynq_network.cpp b/src/lynq/lib/liblynq-network/lynq_network.cpp
index 3f5dbe6..90ded4b 100755
--- a/src/lynq/lib/liblynq-network/lynq_network.cpp
+++ b/src/lynq/lib/liblynq-network/lynq_network.cpp
@@ -340,7 +340,7 @@
     return 0;

 }

 

-int copyCellInfoList(Parcel &p,int *cellinfo,int *tac,int *earfcn)

+int copyCellInfoList(Parcel &p,uint64_t *cellinfo,int *tac,int *earfcn)

 {

     int32_t v=0;

     int64_t v6=0;

@@ -350,6 +350,7 @@
     }

 

     int nothing = 0;

+    int tmp_uint64 = 0;

     p.readInt32(&v);

     RIL_CellInfoType cellinfoType  = RIL_CellInfoType(v);

     p.readInt32(&nothing);

@@ -364,10 +365,11 @@
             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

-            p.readInt32(cellinfo);

+            p.readInt32(&tmp_uint64);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

+            *cellinfo = (uint64_t)tmp_uint64;

             tac = &nothing;

             earfcn = &nothing;

             break;

@@ -376,10 +378,11 @@
             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

-            p.readInt32(cellinfo);

+            p.readInt32(&tmp_uint64);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

+            *cellinfo = (uint64_t)tmp_uint64;

             tac = &nothing;

             earfcn = &nothing;

             break;

@@ -403,7 +406,7 @@
         case RIL_CELL_INFO_TYPE_LTE: {

             p.readInt32(&nothing);

             p.readInt32(&nothing);

-            p.readInt32(cellinfo);

+            p.readInt32(&tmp_uint64);

             p.readInt32(&nothing);

             p.readInt32(tac);

             p.readInt32(earfcn);

@@ -413,15 +416,17 @@
             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

+            *cellinfo = (uint64_t)tmp_uint64;

             break;

         }

         case RIL_CELL_INFO_TYPE_TD_SCDMA: {

             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

-            p.readInt32(cellinfo);

+            p.readInt32(&tmp_uint64);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

+            *cellinfo = (uint64_t)tmp_uint64;

             tac = &nothing;

             earfcn = &nothing;

             break;

@@ -429,7 +434,7 @@
         case RIL_CELL_INFO_TYPE_NR: {

             p.readInt32(&nothing);

             p.readInt32(&nothing);

-            p.readInt32(cellinfo);

+            p.readUint64(cellinfo);

             p.readInt32(&nothing);

             p.readInt32(tac);

             p.readInt32(earfcn);

@@ -442,7 +447,7 @@
             break;

         }

     }

-    LYINFLOG("CID in fUNC :%d",*cellinfo);

+    LYINFLOG("CID in fUNC :%llu",*cellinfo);

     LYINFLOG("tac in fUNC :%d",*tac);

     LYINFLOG("earfcn in fUNC :%d",*earfcn);

     return 0;

@@ -947,7 +952,7 @@
 

 }

 

-int lynq_query_cell_info(int cellinfo[CELLINFO_MAX_NUM],int tac[CELLINFO_MAX_NUM],int earfcn[CELLINFO_MAX_NUM],int * realNum)

+int lynq_query_cell_info(uint64_t cellinfo[CELLINFO_MAX_NUM],int tac[CELLINFO_MAX_NUM],int earfcn[CELLINFO_MAX_NUM],int * realNum)

 {

     int ret = -1;

     if(NULL == realNum)