From cd1031a520ec204990a00ce2bc4f55a6130f7c93 Mon Sep 17 00:00:00 2001
From: Mike Cailean <mcailean@codeaurora.org>
Date: Thu, 18 Apr 2019 12:57:11 -0700
Subject: [PATCH] Update proxyAppPackageName field in nfw notification

Change-Id: I993a6d9227b03626bc254675944df28cc578a6c7
CRs-fixed: 2437418
---
 core/ContextBase.cpp   | 1 +
 core/ContextBase.h     | 1 +
 etc/gps.conf           | 7 +++++++
 utils/gps_extended_c.h | 3 ++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp
index 28109bb0..96507016 100644
--- a/core/ContextBase.cpp
+++ b/core/ContextBase.cpp
@@ -78,6 +78,7 @@ const loc_param_s_type ContextBase::mGps_conf_table[] =
   {"CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD",     &mGps_conf.CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD,    NULL, 'f'},
   {"CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET", &mGps_conf.CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET, NULL, 'n'},
   {"POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED",  &mGps_conf.POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED, NULL, 'n'},
+  {"PROXY_APP_PACKAGE_NAME",         &mGps_conf.PROXY_APP_PACKAGE_NAME,         NULL, 's' },
 };
 
 const loc_param_s_type ContextBase::mSap_conf_table[] =
diff --git a/core/ContextBase.h b/core/ContextBase.h
index 9c728354..8fc2bd5f 100644
--- a/core/ContextBase.h
+++ b/core/ContextBase.h
@@ -71,6 +71,7 @@ typedef struct loc_gps_cfg_s
     double         CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD;
     uint32_t       CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET;
     uint32_t       POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED;
+    char           PROXY_APP_PACKAGE_NAME[LOC_MAX_PARAM_STRING];
 } loc_gps_cfg_s_type;
 
 /* NOTE: the implementaiton of the parser casts number
diff --git a/etc/gps.conf b/etc/gps.conf
index a5dabb2d..f1cf84d8 100644
--- a/etc/gps.conf
+++ b/etc/gps.conf
@@ -281,3 +281,10 @@ MODEM_TYPE = 1
 # SV is available and the UE’s position is known by
 # other position engines.
 #POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED = 0
+
+#####################################
+# proxyAppPackageName
+#####################################
+# This is a string that is sent to the framework
+# in nfwNotifyCb callback
+PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
diff --git a/utils/gps_extended_c.h b/utils/gps_extended_c.h
index 242fe84a..279fa20f 100644
--- a/utils/gps_extended_c.h
+++ b/utils/gps_extended_c.h
@@ -2052,6 +2052,7 @@ struct AGnssExtStatusIpV6 {
 /*
 * Represents the the Nfw Notification structure
 */
+#define GNSS_MAX_NFW_APP_STRING_LEN 64
 #define GNSS_MAX_NFW_STRING_LEN  20
 
 typedef enum {
@@ -2079,7 +2080,7 @@ typedef enum {
 } GnssNfwResponseType;
 
 typedef struct {
-    char                    proxyAppPackageName[GNSS_MAX_NFW_STRING_LEN];
+    char                    proxyAppPackageName[GNSS_MAX_NFW_APP_STRING_LEN];
     GnssNfwProtocolStack    protocolStack;
     char                    otherProtocolStackName[GNSS_MAX_NFW_STRING_LEN];
     GnssNfwRequestor        requestor;