commit 29abf99b27fecf93cef849af6dd13e5f49fa72e7
author haohuang <haohuang@codeaurora.org> Tue Jun 18 18:10:43 2019 +0800
committer Mike Cailean <mcailean@codeaurora.org> Thu Jun 27 09:34:06 2019 -0700
tree 9d5109ecac99a3d3a5f94a0ae596b540ff83629a
parent fb671a9a64d1966455eac5c2fa1f5a302ced755f

Fix SV in use mask isn't correct for multiband SVs

Fix the issue that SV in use mask isn't set correct
in reportSv function in GnssAdapter.cpp.

Change-Id: Ie90fc4b938875817b105745cf531ee8dc31e74bc
CRs-Fixed: 2473868

gnss/GnssAdapter.cpp

diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index 7de3239..3d52d73 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -90,8 +90,7 @@
     mBlockCPIInfo{},
     mLocSystemInfo{},
     mGnssMbSvIdUsedInPosition{},
-    mGnssMbSvIdUsedInPosAvail(false),
-    mGnssSignalType()
+    mGnssMbSvIdUsedInPosAvail(false)
 {
     LOC_LOGD("%s]: Constructor %p", __func__, this);
     mLocPositionMode.mode = LOC_POSITION_MODE_INVALID;
@@ -3089,9 +3088,6 @@
             if (locationExtended.flags & GPS_LOCATION_EXTENDED_HAS_MULTIBAND) {
                 mGnssMbSvIdUsedInPosAvail = true;
                 mGnssMbSvIdUsedInPosition = locationExtended.gnss_mb_sv_used_ids;
-                for (int i = 0; i < GNSS_SV_MAX; i++) {
-                    mGnssSignalType[i] = locationExtended.measUsageInfo[i].gnssSignalType;
-                }
             }
         }
 
@@ -3170,11 +3166,12 @@
     for (int i=0; i < numSv; i++) {
         svUsedIdMask = 0;
         gnssSvId = svNotify.gnssSvs[i].svId;
+        GnssSignalTypeMask signalTypeMask = svNotify.gnssSvs[i].gnssSignalTypeMask;
         switch (svNotify.gnssSvs[i].type) {
             case GNSS_SV_TYPE_GPS:
                 if (mGnssSvIdUsedInPosAvail) {
                     if (mGnssMbSvIdUsedInPosAvail) {
-                        switch (mGnssSignalType[i]) {
+                        switch (signalTypeMask) {
                         case GNSS_SIGNAL_GPS_L1CA:
                             svUsedIdMask = mGnssMbSvIdUsedInPosition.gps_l1ca_sv_used_ids_mask;
                             break;
@@ -3196,7 +3193,7 @@
             case GNSS_SV_TYPE_GLONASS:
                 if (mGnssSvIdUsedInPosAvail) {
                     if (mGnssMbSvIdUsedInPosAvail) {
-                        switch (mGnssSignalType[i]) {
+                        switch (signalTypeMask) {
                         case GNSS_SIGNAL_GLONASS_G1:
                             svUsedIdMask = mGnssMbSvIdUsedInPosition.glo_g1_sv_used_ids_mask;
                             break;
@@ -3212,7 +3209,7 @@
             case GNSS_SV_TYPE_BEIDOU:
                 if (mGnssSvIdUsedInPosAvail) {
                     if (mGnssMbSvIdUsedInPosAvail) {
-                        switch (mGnssSignalType[i]) {
+                        switch (signalTypeMask) {
                         case GNSS_SIGNAL_BEIDOU_B1I:
                             svUsedIdMask = mGnssMbSvIdUsedInPosition.bds_b1i_sv_used_ids_mask;
                             break;
@@ -3237,7 +3234,7 @@
             case GNSS_SV_TYPE_GALILEO:
                 if (mGnssSvIdUsedInPosAvail) {
                     if (mGnssMbSvIdUsedInPosAvail) {
-                        switch (mGnssSignalType[i]) {
+                        switch (signalTypeMask) {
                         case GNSS_SIGNAL_GALILEO_E1:
                             svUsedIdMask = mGnssMbSvIdUsedInPosition.gal_e1_sv_used_ids_mask;
                             break;
@@ -3256,7 +3253,7 @@
             case GNSS_SV_TYPE_QZSS:
                 if (mGnssSvIdUsedInPosAvail) {
                     if (mGnssMbSvIdUsedInPosAvail) {
-                        switch (mGnssSignalType[i]) {
+                        switch (signalTypeMask) {
                         case GNSS_SIGNAL_QZSS_L1CA:
                             svUsedIdMask = mGnssMbSvIdUsedInPosition.qzss_l1ca_sv_used_ids_mask;
                             break;

gnss/GnssAdapter.h

diff --git a/gnss/GnssAdapter.h b/gnss/GnssAdapter.h
index 2c3ff56..f4aa903 100644
--- a/gnss/GnssAdapter.h
+++ b/gnss/GnssAdapter.h
@@ -146,7 +146,6 @@
     bool mGnssSvIdUsedInPosAvail;
     GnssSvMbUsedInPosition mGnssMbSvIdUsedInPosition;
     bool mGnssMbSvIdUsedInPosAvail;
-    GnssSignalTypeMask mGnssSignalType[GNSS_SV_MAX];
 
     /* ==== CONTROL ======================================================================== */
     LocationControlCallbacks mControlCallbacks;