commit 9ffd2c4ee33e62d08ccfab6f617b909880fe88be
author rjw <rjw@exm.com> Tue May 31 17:31:28 2022 +0800
committer rjw <rjw@exm.com> Tue Jun 07 15:07:52 2022 +0800
tree 7cf81ef256daa13cf1bf4f547164ae7baf7d9d88
parent c779defe93501dc6296c4f12abe18d75d091e291

[Bugfix]API-250

Change-Id: Ic54ed79e90ff7147dd61f52fe72935ed507e17e4

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 a67b4dd..3f5dbe6 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 copyCellInfoList(Parcel &p,int *cellinfo,int *tac,int *earfcn)

 {

     int32_t v=0;

     int64_t v6=0;

@@ -369,6 +369,7 @@
             p.readInt32(&nothing);

             p.readInt32(&nothing);

             tac = &nothing;

+            earfcn = &nothing;

             break;

         }

         case RIL_CELL_INFO_TYPE_WCDMA: {

@@ -380,6 +381,7 @@
             p.readInt32(&nothing);

             p.readInt32(&nothing);

             tac = &nothing;

+            earfcn = &nothing;

             break;

         }

         case RIL_CELL_INFO_TYPE_CDMA: {

@@ -395,6 +397,7 @@
             p.readInt32(&nothing);

             cellinfo = 0;

             tac = &nothing;

+            earfcn = &nothing;

             break;

         }

         case RIL_CELL_INFO_TYPE_LTE: {

@@ -403,6 +406,7 @@
             p.readInt32(cellinfo);

             p.readInt32(&nothing);

             p.readInt32(tac);

+            p.readInt32(earfcn);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

@@ -418,6 +422,8 @@
             p.readInt32(cellinfo);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

+            tac = &nothing;

+            earfcn = &nothing;

             break;

         }

         case RIL_CELL_INFO_TYPE_NR: {

@@ -426,7 +432,7 @@
             p.readInt32(cellinfo);

             p.readInt32(&nothing);

             p.readInt32(tac);

-            p.readInt32(&nothing);

+            p.readInt32(earfcn);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

             p.readInt32(&nothing);

@@ -437,6 +443,8 @@
         }

     }

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

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

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

     return 0;

 }

 

@@ -939,7 +947,7 @@
 

 }

 

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

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

 {

     int ret = -1;

     if(NULL == realNum)

@@ -989,7 +997,7 @@
         *realNum = num;

         for(int i = 0;i<num;i++)

         {

-            copyCellInfoList(p,&cellinfo[i],&tac[i]);

+            copyCellInfoList(p,&cellinfo[i],&tac[i],&earfcn[i]);

         }

     }

     return response.error;