From c7b6382ede2ada8cbe6d94a58fc27d91bf8da398 Mon Sep 17 00:00:00 2001
From: Nilesh Gharde <ngharde@codeaurora.org>
Date: Wed, 20 Nov 2019 17:59:43 +0530
Subject: [PATCH] SUPL Version for 5G and LPP Rel 15

Change-Id: Id00ea3bfb72c88c7c68425aa8c8829579ebd6237
CRs-fixed: 2570450
---
 android/1.0/GnssConfiguration.cpp | 3 +++
 android/1.1/GnssConfiguration.cpp | 3 +++
 android/2.0/GnssConfiguration.cpp | 3 +++
 gnss/GnssAdapter.cpp              | 2 ++
 location/LocationDataTypes.h      | 1 +
 5 files changed, 12 insertions(+)

diff --git a/android/1.0/GnssConfiguration.cpp b/android/1.0/GnssConfiguration.cpp
index 0b622494..73c9d5c2 100644
--- a/android/1.0/GnssConfiguration.cpp
+++ b/android/1.0/GnssConfiguration.cpp
@@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version)  {
     config.size = sizeof(GnssConfig);
     config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
     switch (version) {
+        case 0x00020004:
+            config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
+            break;
         case 0x00020002:
             config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
             break;
diff --git a/android/1.1/GnssConfiguration.cpp b/android/1.1/GnssConfiguration.cpp
index 93f96457..708e2c1a 100644
--- a/android/1.1/GnssConfiguration.cpp
+++ b/android/1.1/GnssConfiguration.cpp
@@ -65,6 +65,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version)  {
     config.size = sizeof(GnssConfig);
     config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
     switch (version) {
+        case 0x00020004:
+            config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
+            break;
         case 0x00020002:
             config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
             break;
diff --git a/android/2.0/GnssConfiguration.cpp b/android/2.0/GnssConfiguration.cpp
index 363d2b1e..069c0365 100644
--- a/android/2.0/GnssConfiguration.cpp
+++ b/android/2.0/GnssConfiguration.cpp
@@ -55,6 +55,9 @@ Return<bool> GnssConfiguration::setSuplVersion(uint32_t version)  {
     config.size = sizeof(GnssConfig);
     config.flags = GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT;
     switch (version) {
+        case 0x00020004:
+            config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_4;
+            break;
         case 0x00020002:
             config.suplVersion = GNSS_CONFIG_SUPL_VERSION_2_0_2;
             break;
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index 19dcb6de..0382f19f 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -533,6 +533,8 @@ inline uint32_t
 GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion)
 {
     switch (suplVersion) {
+        case GNSS_CONFIG_SUPL_VERSION_2_0_4:
+            return 0x00020004;
         case GNSS_CONFIG_SUPL_VERSION_2_0_0:
             return 0x00020000;
         case GNSS_CONFIG_SUPL_VERSION_2_0_2:
diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h
index 956754ad..2fb35bf8 100644
--- a/location/LocationDataTypes.h
+++ b/location/LocationDataTypes.h
@@ -248,6 +248,7 @@ typedef enum {
     GNSS_CONFIG_SUPL_VERSION_1_0_0 = 1,
     GNSS_CONFIG_SUPL_VERSION_2_0_0,
     GNSS_CONFIG_SUPL_VERSION_2_0_2,
+    GNSS_CONFIG_SUPL_VERSION_2_0_4,
 } GnssConfigSuplVersion;
 
 // LTE Positioning Profile