Merge "clear magic number for GPS_LOCK"

4 files changed, 10 insertions, 42 deletions

diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index dfb70da..ef094ca 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()) {
@@ -2857,7 +2827,7 @@ GnssAdapter::enableCommand(LocationTechnologyType techType)
                }));
 
                 mAdapter.mXtraObserver.updateLockStatus(
-                        mAdapter.convertGpsLock(GNSS_CONFIG_GPS_LOCK_NONE));
+                        GNSS_CONFIG_GPS_LOCK_NONE);
             }
             mAdapter.reportResponse(err, mSessionId);
         }
@@ -2901,12 +2871,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);
         }
diff --git a/gnss/GnssAdapter.h b/gnss/GnssAdapter.h
index 381ccf4..1f72c43 100644
--- a/gnss/GnssAdapter.h
+++ b/gnss/GnssAdapter.h
@@ -396,8 +396,6 @@ public:
     std::string& getMoServerUrl(void) { return mMoServerUrl; }
 
     /*==== CONVERSION ===================================================================*/
-    static uint32_t convertGpsLock(const GnssConfigGpsLock gpsLock);
-    static GnssConfigGpsLock convertGpsLock(const uint32_t gpsLock);
     static uint32_t convertSuplVersion(const GnssConfigSuplVersion suplVersion);
     static uint32_t convertLppProfile(const GnssConfigLppProfile lppProfile);
     static uint32_t convertEP4ES(const GnssConfigEmergencyPdnForEmergencySupl);
diff --git a/gnss/XtraSystemStatusObserver.cpp b/gnss/XtraSystemStatusObserver.cpp
index d84ae42..962e100 100644
--- a/gnss/XtraSystemStatusObserver.cpp
+++ b/gnss/XtraSystemStatusObserver.cpp
@@ -56,7 +56,7 @@ using namespace loc_core;
 #endif
 #define LOG_TAG "LocSvc_XSSO"
 
-bool XtraSystemStatusObserver::updateLockStatus(uint32_t lock) {
+bool XtraSystemStatusObserver::updateLockStatus(GnssConfigGpsLock lock) {
     mGpsLock = lock;
 
     if (!mReqStatusReceived) {
diff --git a/gnss/XtraSystemStatusObserver.h b/gnss/XtraSystemStatusObserver.h
index b49a0bc..cbbeda6 100644
--- a/gnss/XtraSystemStatusObserver.h
+++ b/gnss/XtraSystemStatusObserver.h
@@ -60,7 +60,7 @@ public :
     inline virtual void getName(string& name);
     virtual void notify(const list<IDataItemCore*>& dlist);
 
-    bool updateLockStatus(uint32_t lock);
+    bool updateLockStatus(GnssConfigGpsLock lock);
     bool updateConnections(uint64_t allConnections);
     bool updateTac(const string& tac);
     bool updateMccMnc(const string& mccmnc);
@@ -74,7 +74,7 @@ protected:
 private:
     IOsObserver*    mSystemStatusObsrvr;
     const MsgTask* mMsgTask;
-    int32_t mGpsLock;
+    GnssConfigGpsLock mGpsLock;
     uint64_t mConnections;
     string mTac;
     string mMccmnc;