commit ff37310f1775e1745767486fb3194e92104cce77
author Harikrishnan Hariharan <hahariha@codeaurora.org> Tue Dec 20 17:46:40 2016 +0530
committer Baili Feng <bailif@codeaurora.org> Thu Mar 16 10:17:39 2017 +0800
tree 8d8e063a921ac5873c620357adf767a5a07e45cb
parent 681388fa8dd3f1ff9c8b788ac20e90a16fd5b62d

Fix issue of incorrect set of used_in_fix flag

Due to incorrect check for SVID for GNSS systems in location
engine ReportSv function, incorrect used_in_fix flag was set.
Modify the condition check to be based on the constellation
system ID, to set the used_in_fix flag.

Change-Id: Ic74583257c2925361dc68a9865cd80271167bf0c
CRs-Fixed: 1102862

gnss/GnssAdapter.cpp

diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index e37a992..6cce9d1 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -1923,27 +1923,30 @@
     if (mGnssSvIdUsedInPosAvail) {
         int numSv = svNotify.count;
         int16_t gnssSvId = 0;
-        int prnMin = 0;
         uint64_t svUsedIdMask = 0;
         for (int i=0; i < numSv; i++) {
             gnssSvId = svNotify.gnssSvs[i].svId;
-            if (gnssSvId <= GPS_SV_PRN_MAX) {
-                svUsedIdMask = mGnssSvIdUsedInPosition.gps_sv_used_ids_mask;
-                prnMin = GPS_SV_PRN_MIN;
-            } else if ((gnssSvId >= GLO_SV_PRN_MIN) && (gnssSvId <= GLO_SV_PRN_MAX)) {
-                svUsedIdMask = mGnssSvIdUsedInPosition.glo_sv_used_ids_mask;
-                prnMin = GLO_SV_PRN_MIN;
-            } else if ((gnssSvId >= BDS_SV_PRN_MIN) && (gnssSvId <= BDS_SV_PRN_MAX)) {
-                svUsedIdMask = mGnssSvIdUsedInPosition.bds_sv_used_ids_mask;
-                prnMin = BDS_SV_PRN_MIN;
-            } else if ((gnssSvId >= GAL_SV_PRN_MIN) && (gnssSvId <= GAL_SV_PRN_MAX)) {
-                svUsedIdMask = mGnssSvIdUsedInPosition.gal_sv_used_ids_mask;
-                prnMin = GAL_SV_PRN_MIN;
+            switch (svNotify.gnssSvs[i].type) {
+                case GNSS_SV_TYPE_GPS:
+                    svUsedIdMask = mGnssSvIdUsedInPosition.gps_sv_used_ids_mask;
+                    break;
+                case GNSS_SV_TYPE_GLONASS:
+                    svUsedIdMask = mGnssSvIdUsedInPosition.glo_sv_used_ids_mask;
+                    break;
+                case GNSS_SV_TYPE_BEIDOU:
+                    svUsedIdMask = mGnssSvIdUsedInPosition.bds_sv_used_ids_mask;
+                    break;
+                case GNSS_SV_TYPE_GALILEO:
+                    svUsedIdMask = mGnssSvIdUsedInPosition.gal_sv_used_ids_mask;
+                    break;
+                default:
+                    svUsedIdMask = 0;
+                    break;
             }
 
             // If SV ID was used in previous position fix, then set USED_IN_FIX
             // flag, else clear the USED_IN_FIX flag.
-            if (svUsedIdMask & (1 << (gnssSvId - prnMin))) {
+            if (svUsedIdMask & (1 << (gnssSvId - 1))) {
                 svNotify.gnssSvs[i].gnssSvOptionsMask |= GNSS_SV_OPTIONS_USED_IN_FIX_BIT;
             } else {
                 svNotify.gnssSvs[i].gnssSvOptionsMask &= ~GNSS_SV_OPTIONS_USED_IN_FIX_BIT;