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

Merge 818dacd234 on remote branch

Browse source 
Change-Id: I16eb92afa01ffa7370028f58c4137b45fa33ca3e
This commit is contained in:
Linux Build Service Account 2019-08-21 01:26:35 -07:00
commit a40ff72ae9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnss/GnssAdapter.cpp
View file

@ -1082,9 +1082,8 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) { if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) {
GnssConfigGpsLock newGpsLock = gnssConfigRequested.gpsLock; GnssConfigGpsLock newGpsLock = gnssConfigRequested.gpsLock;
if (GNSS_CONFIG_GPS_LOCK_NONE == newGpsLock) {
newGpsLock = GNSS_CONFIG_GPS_LOCK_MO; newGpsLock |= GNSS_CONFIG_GPS_LOCK_MO;
}
ContextBase::mGps_conf.GPS_LOCK = newGpsLock; ContextBase::mGps_conf.GPS_LOCK = newGpsLock;
/* If we get here it means that the changes in the framework to request for /* If we get here it means that the changes in the framework to request for
'P' behavior were made, and therefore we need to "behave" as in 'P' 'P' behavior were made, and therefore we need to "behave" as in 'P'
@ -1102,7 +1101,7 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
in this case (return to 'P' code) */ in this case (return to 'P' code) */
if (mAdapter.mSupportNfwControl) { if (mAdapter.mSupportNfwControl) {
// case 1 above // case 1 above
newGpsLock &= ~GNSS_CONFIG_GPS_LOCK_NI; newGpsLock = GNSS_CONFIG_GPS_LOCK_NONE;
} else { } else {
// case 2 above // case 2 above
gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT); gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT);