diff options
author | Yingjie Wang <yingjiewang@codeaurora.org> | 2019-08-19 10:57:41 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-08-22 23:21:24 -0700 |
commit | d3e6df06e217f94033b4e746e639d0b1f2d5fcc5 (patch) | |
tree | 47e1cc71dd54df256877735df282ab63144b380a /gnss | |
parent | 5ee0b62e8c53ba6a57300541dbbae6b2e9cf9a8a (diff) | |
download | gps-d3e6df06e217f94033b4e746e639d0b1f2d5fcc5.tar.gz |
Remove LPPe UP/CP config in gps.conf
LPPE_CP_TECHNOLOGY and LPPE_UP_TECHNOLOGY can be
configured per SIM so they should not be overriden
by gps.conf by default. Leave commented out for
testing purpose;
Add check before LPPe injection when engine up.
Change-Id: I1b9b33009ec45d0a14c2e50e29d0a9df636a6319
CRs-fixed: 2505512
Diffstat (limited to 'gnss')
-rw-r--r-- | gnss/GnssAdapter.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 47e5527..7b5527a 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -722,8 +722,6 @@ GnssAdapter::setConfig() //cache the injected configuration with GnssConfigRequested struct GnssConfig gnssConfigRequested = {}; gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT | - GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT | - GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT | GNSS_CONFIG_FLAGS_BLACKLISTED_SV_IDS_BIT; /* Here we process an SSR. We need to set the GPS_LOCK to the proper values, as follows: 1. Q behavior. This is identified by mSupportNfwControl being 1. In this case @@ -756,10 +754,17 @@ GnssAdapter::setConfig() gnssConfigRequested.aGlonassPositionProtocolMask = gpsConf.A_GLONASS_POS_PROTOCOL_SELECT; } - gnssConfigRequested.lppeControlPlaneMask = - mLocApi->convertLppeCp(gpsConf.LPPE_CP_TECHNOLOGY); - gnssConfigRequested.lppeUserPlaneMask = - mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY); + if (gpsConf.LPPE_CP_TECHNOLOGY) { + gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT; + gnssConfigRequested.lppeControlPlaneMask = + mLocApi->convertLppeCp(gpsConf.LPPE_CP_TECHNOLOGY); + } + + if (gpsConf.LPPE_UP_TECHNOLOGY) { + gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT; + gnssConfigRequested.lppeUserPlaneMask = + mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY); + } gnssConfigRequested.blacklistedSvIds.assign(mBlacklistedSvIds.begin(), mBlacklistedSvIds.end()); mLocApi->sendMsg(new LocApiMsg( |