Merge "fix multiple GPS_LOCK request"

This commit is contained in:
qctecmdr Service 2019-01-04 21:25:14 -08:00 committed by Gerrit - the friendly Code Review server
commit f575c9c0d1

View file

@ -846,13 +846,14 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) { if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) {
uint32_t newGpsLock = mAdapter.convertGpsLock(gnssConfigRequested.gpsLock); uint32_t newGpsLock = mAdapter.convertGpsLock(gnssConfigRequested.gpsLock);
ContextBase::mGps_conf.GPS_LOCK = newGpsLock; if (0 == newGpsLock) {
if (0 == ContextBase::mGps_conf.GPS_LOCK) { newGpsLock = 3;
ContextBase::mGps_conf.GPS_LOCK = 3;
} }
if (0 != mAdapter.getPowerVoteId()) { if (newGpsLock == ContextBase::mGps_conf.GPS_LOCK ||
0 != mAdapter.getPowerVoteId()) {
gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT); gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT);
} }
ContextBase::mGps_conf.GPS_LOCK = newGpsLock;
index++; index++;
} }
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT) { if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT) {