From 050de4e82ea5ce5fe95bf40c5493d42be0c2e6d6 Mon Sep 17 00:00:00 2001
From: Saurabh Srivastava <ssrivast@codeaurora.org>
Date: Fri, 11 May 2018 01:27:14 +0530
Subject: [PATCH] Adding offset for SV ID values

Adding offset to SV ID values
received for blacklisting in HIDL
API.

Change-Id: I16dd5e918e9397a23fa4e142dd94d029970f4217
CRs-Fixed: 2239179
---
 android/GnssConfiguration.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/android/GnssConfiguration.cpp b/android/GnssConfiguration.cpp
index f52ae4bd..93f96457 100644
--- a/android/GnssConfiguration.cpp
+++ b/android/GnssConfiguration.cpp
@@ -261,7 +261,9 @@ bool GnssConfiguration::setBlacklistedSource(
         const GnssConfiguration::BlacklistedSource& copyFromSource) {
 
     bool retVal = true;
+    uint16_t svIdOffset = 0;
     copyToSource.size = sizeof(GnssSvIdSource);
+    copyToSource.svId = copyFromSource.svid;
 
     switch(copyFromSource.constellation) {
     case GnssConstellationType::GPS:
@@ -276,15 +278,19 @@ bool GnssConfiguration::setBlacklistedSource(
         break;
     case GnssConstellationType::GLONASS:
         copyToSource.constellation = GNSS_SV_TYPE_GLONASS;
+        svIdOffset = GNSS_SV_CONFIG_GLO_INITIAL_SV_ID - 1;
         break;
     case GnssConstellationType::QZSS:
         copyToSource.constellation = GNSS_SV_TYPE_QZSS;
+        svIdOffset = 0;
         break;
     case GnssConstellationType::BEIDOU:
         copyToSource.constellation = GNSS_SV_TYPE_BEIDOU;
+        svIdOffset = GNSS_SV_CONFIG_BDS_INITIAL_SV_ID - 1;
         break;
     case GnssConstellationType::GALILEO:
         copyToSource.constellation = GNSS_SV_TYPE_GALILEO;
+        svIdOffset = GNSS_SV_CONFIG_GAL_INITIAL_SV_ID - 1;
         break;
     default:
         copyToSource.constellation = GNSS_SV_TYPE_UNKNOWN;
@@ -293,7 +299,10 @@ bool GnssConfiguration::setBlacklistedSource(
         break;
     }
 
-    copyToSource.svId = copyFromSource.svid;
+    if (copyToSource.svId > 0 && svIdOffset > 0) {
+        copyToSource.svId += svIdOffset;
+    }
+
     return retVal;
 }