MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove LPPe UP/CP config in gps.conf

Browse source 
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
This commit is contained in:
Yingjie Wang 2019-08-19 10:57:41 +08:00 committed by Gerrit - the friendly Code Review server
parent 5ee0b62e8c
commit d3e6df06e2
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/gps.conf
View file

@ -117,7 +117,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
# 0x2: WLAN AP Measurements for LPPe CP
# 0x4: SRN AP measurement for CP
# 0x8: Sensor Barometer Measurement LPPe CP
LPPE_CP_TECHNOLOGY = 0
#LPPE_CP_TECHNOLOGY = 0
##################################################
# Select technology for LPPe User Plane
@ -126,7 +126,7 @@ LPPE_CP_TECHNOLOGY = 0
# 0x2: WLAN AP Measurements for LPPe UP
# 0x4: SRN AP measurement for UP
# 0x8: Sensor Barometer Measurement LPPe UP
LPPE_UP_TECHNOLOGY = 0
#LPPE_UP_TECHNOLOGY = 0
##################################################
# AGPS_CONFIG_INJECT

17
gnss/GnssAdapter.cpp
View file

@ -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(