commit f6527aebbce5e2b6b771fa42ae499c2e7584bd26
author Wyatt Riley <wyattriley@google.com> Mon May 23 15:23:12 2016 -0700
committer Wyatt Riley <wyattriley@google.com> Tue May 24 09:25:02 2016 -0700
tree c549624871a100b8765fa416e811757da994efa2
parent 42d4a337a3b1a14f4d9daf6eb8275a01ba20e680

Adding SBAS offset to Gps/Gnss SvStatus converter

Opposite sign of Glonass & BDS offsets.  Noticed after screenshot search & further testing.

Bug: 28623392
Change-Id: I6a7c98f455ee7df278eed985ba57ec1c12d888e0

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index e29452a..e8d4c58 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -72,15 +72,18 @@
 #define GPS_MAX_SATELLITE_COUNT 32
 #define GNSS_MAX_SATELLITE_COUNT 64
 
-// Let these through, with ID remapped by offset
+// Let these through, with ID remapped down to 1, 2... by offset
 #define GLONASS_SVID_OFFSET 64
 #define GLONASS_SVID_COUNT 24
 #define BEIDOU_SVID_OFFSET 200
 #define BEIDOU_SVID_COUNT 35
 
+// Let these through, with ID remapped up (33->120 ... 64->151, etc.)
+#define SBAS_SVID_MIN 33
+#define SBAS_SVID_MAX 64
+#define SBAS_SVID_ADD 87
+
 // Let these through, with no ID remapping
-#define SBAS_SVID_MIN 120
-#define SBAS_SVID_MAX 151
 #define QZSS_SVID_MIN 193
 #define QZSS_SVID_MAX 200
 
@@ -159,6 +162,7 @@
             info.svid -= BEIDOU_SVID_OFFSET;
         } else if (info.svid >= SBAS_SVID_MIN && info.svid <= SBAS_SVID_MAX) {
             info.constellation = GNSS_CONSTELLATION_SBAS;
+            info.svid += SBAS_SVID_ADD;
         } else if (info.svid >= QZSS_SVID_MIN && info.svid <= QZSS_SVID_MAX) {
             info.constellation = GNSS_CONSTELLATION_QZSS;
         } else {