diff options
| author | Mike Cailean <mcailean@codeaurora.org> | 2019-05-01 13:19:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-03 09:09:03 -0700 |
| commit | aa95ca27f8db9f0a47116344ca4d12042acdb63b (patch) | |
| tree | fc5d3c9db30a103a288aa865d68c1b97caff1bba | |
| parent | f4553e1de05456cd0bb1e07e647d19d2ea119b76 (diff) | |
| download | gps-aa95ca27f8db9f0a47116344ca4d12042acdb63b.tar.gz | |
Process CP_MTLR in emergency in different conditions
Prcess CP_MTLR based on a new configuration item
Change-Id: I9351f574f0b1a4bad2b88f2627ab188ac1522e92
CRs-fixed: 2444954
| -rw-r--r-- | core/ContextBase.cpp | 4 | ||||
| -rw-r--r-- | core/ContextBase.h | 1 | ||||
| -rw-r--r-- | etc/gps.conf | 6 | ||||
| -rw-r--r-- | gnss/GnssAdapter.cpp | 16 |
4 files changed, 20 insertions, 7 deletions
diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp index 12e550f..084b6bf 100644 --- a/core/ContextBase.cpp +++ b/core/ContextBase.cpp @@ -79,6 +79,7 @@ const loc_param_s_type ContextBase::mGps_conf_table[] = {"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' }, + {"CP_MTLR_ES", &mGps_conf.CP_MTLR_ES, NULL, 'n' }, }; const loc_param_s_type ContextBase::mSap_conf_table[] = @@ -112,7 +113,8 @@ void ContextBase::readConfig() mGps_conf.GPS_LOCK = GNSS_CONFIG_GPS_LOCK_MO_AND_NI; mGps_conf.SUPL_VER = 0x10000; mGps_conf.SUPL_MODE = 0x1; - mGps_conf.SUPL_ES = 1; + mGps_conf.SUPL_ES = 0; + mGps_conf.CP_MTLR_ES = 0; mGps_conf.SUPL_HOST[0] = 0; mGps_conf.SUPL_PORT = 0; mGps_conf.CAPABILITIES = 0x7; diff --git a/core/ContextBase.h b/core/ContextBase.h index 8fc2bd5..ab61a08 100644 --- a/core/ContextBase.h +++ b/core/ContextBase.h @@ -72,6 +72,7 @@ typedef struct loc_gps_cfg_s uint32_t CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET; uint32_t POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED; char PROXY_APP_PACKAGE_NAME[LOC_MAX_PARAM_STRING]; + uint32_t CP_MTLR_ES; } loc_gps_cfg_s_type; /* NOTE: the implementaiton of the parser casts number diff --git a/etc/gps.conf b/etc/gps.conf index 2ec3f69..35a0a7e 100644 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -288,3 +288,9 @@ MODEM_TYPE = 1 # This is a string that is sent to the framework # in nfwNotifyCb callback PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation + +##################################### +# CP_MTLR_ES +##################################### +# CP MTLR ES, 1=enable, 0=disable +CP_MTLR_ES=0 diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 31cd886..a6d82bf 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -3409,16 +3409,20 @@ GnssAdapter::requestNiNotifyEvent(const GnssNiNotification ¬ify, const void* mNotify(notify), mData(data) {} inline virtual void proc() const { - if (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type || - GNSS_NI_TYPE_CONTROL_PLANE == mNotify.type) { + if (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type) { if (mAdapter.getE911State() || - ((GNSS_CONFIG_SUPL_EMERGENCY_SERVICES_NO == ContextBase::mGps_conf.SUPL_ES) && - (GNSS_NI_TYPE_EMERGENCY_SUPL == mNotify.type))) { + (GNSS_CONFIG_SUPL_EMERGENCY_SERVICES_NO == ContextBase::mGps_conf.SUPL_ES)) { mApi.informNiResponse(GNSS_NI_RESPONSE_ACCEPT, mData); - } - else { + } else { mApi.informNiResponse(GNSS_NI_RESPONSE_DENY, mData); } + } else if (GNSS_NI_TYPE_CONTROL_PLANE == mNotify.type) { + if (mAdapter.getE911State() && + (1 == ContextBase::mGps_conf.CP_MTLR_ES)) { + mApi.informNiResponse(GNSS_NI_RESPONSE_ACCEPT, mData); + } else { + mAdapter.requestNiNotify(mNotify, mData); + } } else { mAdapter.requestNiNotify(mNotify, mData); } |