diff options
| author | Mike Cailean <mcailean@codeaurora.org> | 2019-07-03 17:55:17 -0700 |
|---|---|---|
| committer | Mike Cailean <mcailean@codeaurora.org> | 2020-12-11 16:24:48 -0800 |
| commit | 8c4a0ec3c118b2c9d6670d6b7fa783f0bbc99b69 (patch) | |
| tree | 98847c27f8a3f634fbfa0561902f93445eeb7629 /core | |
| parent | 5b08f5c588593efa335ebf83a99df3be6c7ffdfd (diff) | |
SUPL-2.0-con-034-1/2 test case fails
SUPL-2.0-con-034-1/2 Fail because Emergency-NI
did not check inprogress session
Change-Id: I377955c455830bf3bb7cb7fe05d45c4536dabfbc
CRs-fixed: 2483780
Diffstat (limited to 'core')
| -rw-r--r-- | core/LocAdapterBase.cpp | 4 | ||||
| -rw-r--r-- | core/LocAdapterBase.h | 3 | ||||
| -rw-r--r-- | core/LocApiBase.cpp | 8 | ||||
| -rw-r--r-- | core/LocApiBase.h | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp index 14e4857..17a3172 100644 --- a/core/LocAdapterBase.cpp +++ b/core/LocAdapterBase.cpp @@ -163,7 +163,9 @@ bool LocAdapterBase:: DEFAULT_IMPL(false) bool LocAdapterBase:: - requestNiNotifyEvent(const GnssNiNotification &/*notify*/, const void* /*data*/) + requestNiNotifyEvent(const GnssNiNotification &/*notify*/, + const void* /*data*/, + const LocInEmergency emergencyState) DEFAULT_IMPL(false) void LocAdapterBase:: diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h index ed1ad6e..b2188c7 100644 --- a/core/LocAdapterBase.h +++ b/core/LocAdapterBase.h @@ -181,7 +181,8 @@ public: virtual bool requestATL(int connHandle, LocAGpsType agps_type, LocApnTypeMask apn_type_mask); virtual bool releaseATL(int connHandle); - virtual bool requestNiNotifyEvent(const GnssNiNotification ¬ify, const void* data); + virtual bool requestNiNotifyEvent(const GnssNiNotification ¬ify, const void* data, + const LocInEmergency emergencyState); inline virtual bool isInSession() { return false; } ContextBase* getContext() const { return mContext; } virtual void reportGnssMeasurementDataEvent(const GnssMeasurementsNotification& measurements, diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index 50d7369..cdbb382 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -521,10 +521,14 @@ void LocApiBase::releaseATL(int connHandle) TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->releaseATL(connHandle)); } -void LocApiBase::requestNiNotify(GnssNiNotification ¬ify, const void* data) +void LocApiBase::requestNiNotify(GnssNiNotification ¬ify, const void* data, + const LocInEmergency emergencyState) { // loop through adapters, and deliver to the first handling adapter. - TO_1ST_HANDLING_LOCADAPTERS(mLocAdapters[i]->requestNiNotifyEvent(notify, data)); + TO_1ST_HANDLING_LOCADAPTERS( + mLocAdapters[i]->requestNiNotifyEvent(notify, + data, + emergencyState)); } void* LocApiBase :: getSibling() diff --git a/core/LocApiBase.h b/core/LocApiBase.h index 05f7db5..4b2b887 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -182,7 +182,8 @@ public: void requestLocation(); void requestATL(int connHandle, LocAGpsType agps_type, LocApnTypeMask apn_type_mask); void releaseATL(int connHandle); - void requestNiNotify(GnssNiNotification ¬ify, const void* data); + void requestNiNotify(GnssNiNotification ¬ify, const void* data, + const LocInEmergency emergencyState); void reportGnssMeasurementData(GnssMeasurementsNotification& measurements, int msInWeek); void reportWwanZppFix(LocGpsLocation &zppLoc); void reportZppBestAvailableFix(LocGpsLocation &zppLoc, GpsLocationExtended &location_extended, |