Promotion of location.lnx.2.0-00017.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1013650   Ie02b1284cc5c24f526c82c52ff1ecda066655aac   Added debug messages for SV Info
1036070   Ie9ecc851fe53814f4a3e386b503b61bbca9d156d   Fixed SSR issue for GNSS Measurements

Change-Id: I6a5aed80747df4e67d95264b69e349993d6aaea2
CRs-Fixed: 1036070, 1013650

core/LocApiBase.cpp

@@ -258,24 +258,35 @@ void LocApiBase::reportSv(GnssSvStatus &svStatus,
                   GpsLocationExtended &locationExtended,
                   void* svExt)
 {
+    const char* constellationString[] = { "Unknown", "GPS", "SBAS", "GLONASS",
+        "QZSS", "BEIDOU", "GALILEO" };
+
     // print the SV info before delivering
-    LOC_LOGV("num sv: %d", svStatus.num_svs);
+    LOC_LOGV("num sv: %d\n"
+        "      sv: constellation svid         cN0"
+        "    elevation    azimuth    flags",
+        svStatus.num_svs);
     for (int i = 0; i < svStatus.num_svs && i < GNSS_MAX_SVS; i++) {
-        LOC_LOGV("   %03d:   %02d    %d    %f    %f    %f   0x%02X",
+        if (svStatus.gnss_sv_list[i].constellation >
-                 i,
+            sizeof(constellationString) / sizeof(constellationString[0]) - 1) {
-                 svStatus.gnss_sv_list[i].svid,
+            svStatus.gnss_sv_list[i].constellation = 0;
-                 svStatus.gnss_sv_list[i].constellation,
+        }
-                 svStatus.gnss_sv_list[i].c_n0_dbhz,
+        LOC_LOGV("   %03d: %*s  %02d    %f    %f    %f   0x%02X",
-                 svStatus.gnss_sv_list[i].elevation,
+            i,
-                 svStatus.gnss_sv_list[i].azimuth,
+            13,
-                 svStatus.gnss_sv_list[i].flags);
+            constellationString[svStatus.gnss_sv_list[i].constellation],
+            svStatus.gnss_sv_list[i].svid,
+            svStatus.gnss_sv_list[i].c_n0_dbhz,
+            svStatus.gnss_sv_list[i].elevation,
+            svStatus.gnss_sv_list[i].azimuth,
+            svStatus.gnss_sv_list[i].flags);
     }
     // loop through adapters, and deliver to all adapters.
     TO_ALL_LOCADAPTERS(
         mLocAdapters[i]->reportSv(svStatus,
-                                     locationExtended,
+            locationExtended,
-                                     svExt)
+            svExt)
-    );
+        );
 }
 
 void LocApiBase::reportSvMeasurement(GnssSvMeasurementSet &svMeasurementSet)
@@ -569,11 +580,6 @@ enum loc_api_adapter_err LocApiBase::
     setXtraVersionCheck(enum xtra_version_check check)
 DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS)
 
-int LocApiBase::
-    updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                           loc_registration_mask_status isEnabled)
-DEFAULT_IMPL(-1)
-
 bool LocApiBase::
     gnssConstellationConfig()
 DEFAULT_IMPL(false)

core/LocApiBase.h

@@ -256,11 +256,6 @@ public:
 
     virtual enum loc_api_adapter_err setXtraVersionCheck(enum xtra_version_check check);
 
-    /*
-      Update gps reporting events
-     */
-    virtual int updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                                       loc_registration_mask_status isEnabled);
     /*
       Check if the modem support the service
      */

loc_api/libloc_api_50001/LocEngAdapter.cpp

@@ -587,22 +587,6 @@ void LocEngAdapter::reportGnssMeasurementData(GnssData &gnssMeasurementData)
                                            gnssMeasurementData));
 }
 
-/*
-  Update Registration Mask
- */
-void LocEngAdapter::updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                                           loc_registration_mask_status isEnabled)
-{
-    LOC_LOGD("entering %s", __func__);
-    int result = LOC_API_ADAPTER_ERR_FAILURE;
-    result = mLocApi->updateRegistrationMask(event, isEnabled);
-    if (result == LOC_API_ADAPTER_ERR_SUCCESS) {
-        LOC_LOGD("%s] update registration mask succeed.", __func__);
-    } else {
-        LOC_LOGE("%s] update registration mask failed.", __func__);
-    }
-}
-
 /*
   Set Gnss Constellation Config
  */

loc_api/libloc_api_50001/LocEngAdapter.h

@@ -351,12 +351,6 @@ public:
         return mLocApi->getGpsLock();
     }
 
-    /*
-      Update Registration Mask
-     */
-    void updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                                loc_registration_mask_status isEnabled);
-
     /*
       Set Gnss Constellation Config
      */

loc_api/libloc_api_50001/loc_eng.cpp

@@ -1666,29 +1666,6 @@ struct LocEngInstallAGpsCert : public LocMsg {
     }
 };
 
-struct LocEngUpdateRegistrationMask : public LocMsg {
-    loc_eng_data_s_type* mLocEng;
-    LOC_API_ADAPTER_EVENT_MASK_T mMask;
-    loc_registration_mask_status mIsEnabled;
-    inline LocEngUpdateRegistrationMask(loc_eng_data_s_type* locEng,
-                                        LOC_API_ADAPTER_EVENT_MASK_T mask,
-                                        loc_registration_mask_status isEnabled) :
-        LocMsg(), mLocEng(locEng), mMask(mask), mIsEnabled(isEnabled) {
-        locallog();
-    }
-    inline virtual void proc() const {
-        loc_eng_data_s_type *locEng = (loc_eng_data_s_type *)mLocEng;
-        locEng->adapter->updateRegistrationMask(mMask,
-                                                mIsEnabled);
-    }
-    void locallog() const {
-        LOC_LOGV("LocEngUpdateRegistrationMask\n");
-    }
-    virtual void log() const {
-        locallog();
-    }
-};
-
 struct LocEngGnssConstellationConfig : public LocMsg {
     LocEngAdapter* mAdapter;
     inline LocEngGnssConstellationConfig(LocEngAdapter* adapter) :
@@ -3053,10 +3030,7 @@ int loc_eng_gps_measurement_init(loc_eng_data_s_type &loc_eng_data,
 
     // updated the mask
     LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT;
-    loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask(
+    loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_ENABLED);
-                                                        &loc_eng_data,
-                                                        event,
-                                                        LOC_REGISTRATION_MASK_ENABLED));
     // set up the callback
     loc_eng_data.gnss_measurement_cb = callbacks->gnss_measurement_callback;
     LOC_LOGD ("%s, event masks updated successfully", __func__);
@@ -3088,10 +3062,7 @@ void loc_eng_gps_measurement_close(loc_eng_data_s_type &loc_eng_data)
 
     // updated the mask
     LOC_API_ADAPTER_EVENT_MASK_T event = LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT;
-    loc_eng_data.adapter->sendMsg(new LocEngUpdateRegistrationMask(
+    loc_eng_data.adapter->updateEvtMask(event, LOC_REGISTRATION_MASK_DISABLED);
-                                                          &loc_eng_data,
-                                                          event,
-                                                          LOC_REGISTRATION_MASK_DISABLED));
     // set up the callback
     loc_eng_data.gnss_measurement_cb = NULL;
     EXIT_LOG(%d, 0);