clear magic number for GPS_LOCK

Change-Id: I3c1b5a18ab16382a436098f8af541bf7f125783e
CRs-fixed: 2370451

1 files changed, 7 insertions, 37 deletions

diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index fe02db1..eee55e3 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -428,37 +428,7 @@ GnssAdapter::convertLocationInfo(GnssLocationInfoNotification& out,
     }
 }
 
-inline uint32_t
-GnssAdapter::convertGpsLock(const GnssConfigGpsLock gpsLock)
-{
-    switch (gpsLock) {
-        case GNSS_CONFIG_GPS_LOCK_MO:
-            return 1;
-        case GNSS_CONFIG_GPS_LOCK_NI:
-            return 2;
-        case GNSS_CONFIG_GPS_LOCK_MO_AND_NI:
-            return 3;
-        case GNSS_CONFIG_GPS_LOCK_NONE:
-        default:
-            return 0;
-    }
-}
 
-inline GnssConfigGpsLock
-GnssAdapter::convertGpsLock(const uint32_t gpsLock)
-{
-    switch (gpsLock) {
-        case 1:
-            return GNSS_CONFIG_GPS_LOCK_MO;
-        case 2:
-            return GNSS_CONFIG_GPS_LOCK_NI;
-        case 3:
-            return GNSS_CONFIG_GPS_LOCK_MO_AND_NI;
-        case 0:
-        default:
-            return GNSS_CONFIG_GPS_LOCK_NONE;
-    }
-}
 
 inline uint32_t
 GnssAdapter::convertSuplVersion(const GnssConfigSuplVersion suplVersion)
@@ -689,7 +659,7 @@ GnssAdapter::setConfigCommand()
                         GNSS_CONFIG_FLAGS_BLACKLISTED_SV_IDS_BIT;
                 gnssConfigRequested.gpsLock = GNSS_CONFIG_GPS_LOCK_NONE;
                 if (0 == adapter.getPowerVoteId()) {
-                    gnssConfigRequested.gpsLock = adapter.convertGpsLock(gpsConf.GPS_LOCK);
+                    gnssConfigRequested.gpsLock = gpsConf.GPS_LOCK;
                 }
 
                 if (gpsConf.AGPS_CONFIG_INJECT) {
@@ -1010,9 +980,9 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
             int index = 0;
 
             if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT) {
-                uint32_t newGpsLock = mAdapter.convertGpsLock(gnssConfigRequested.gpsLock);
-                if (0 == newGpsLock) {
-                    newGpsLock = 3;
+                GnssConfigGpsLock newGpsLock = gnssConfigRequested.gpsLock;
+                if (GNSS_CONFIG_GPS_LOCK_NONE == newGpsLock) {
+                    newGpsLock = GNSS_CONFIG_GPS_LOCK_MO_AND_NI;
                 }
                 if (newGpsLock == ContextBase::mGps_conf.GPS_LOCK ||
                         0 != mAdapter.getPowerVoteId()) {
@@ -2846,7 +2816,7 @@ GnssAdapter::enableCommand(LocationTechnologyType techType)
                }));
 
                 mAdapter.mXtraObserver.updateLockStatus(
-                        mAdapter.convertGpsLock(GNSS_CONFIG_GPS_LOCK_NONE));
+                        GNSS_CONFIG_GPS_LOCK_NONE);
             }
             mAdapter.reportResponse(err, mSessionId);
         }
@@ -2890,12 +2860,12 @@ GnssAdapter::disableCommand(uint32_t id)
                 mAdapter.setPowerVoteId(0);
 
                 GnssConfigGpsLock gpsLock =
-                    mAdapter.convertGpsLock(ContextBase::mGps_conf.GPS_LOCK);
+                    ContextBase::mGps_conf.GPS_LOCK;
                 mApi.sendMsg(new LocApiMsg([&mApi = mApi,gpsLock] () {
                     mApi.setGpsLockSync(gpsLock);
                 }));
                 mAdapter.mXtraObserver.updateLockStatus(
-                        mAdapter.convertGpsLock(ContextBase::mGps_conf.GPS_LOCK));
+                        ContextBase::mGps_conf.GPS_LOCK);
             }
             mAdapter.reportResponse(err, mSessionId);
         }