From 818dacd2345041fd13ab96b5beefa1480689a519 Mon Sep 17 00:00:00 2001 From: Mike Cailean Date: Tue, 30 Jul 2019 18:35:42 -0700 Subject: GPS_LOCK has the wrong value after killing GNSS process CRs-fixed: 2500864 Change-Id: I5b6cd779ef5c378eedfb54b74b29dbf3191784a1 --- gnss/GnssAdapter.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnss') diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 252b76c..47e5527 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -1082,9 +1082,8 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config) if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) { 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; /* 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' @@ -1102,7 +1101,7 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config) in this case (return to 'P' code) */ if (mAdapter.mSupportNfwControl) { // case 1 above - newGpsLock &= ~GNSS_CONFIG_GPS_LOCK_NI; + newGpsLock = GNSS_CONFIG_GPS_LOCK_NONE; } else { // case 2 above gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT); -- cgit v1.2.3