MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Selectively send deleteAll command to engines"

Browse source
This commit is contained in:
qctecmdr 2019-09-13 10:29:00 -07:00 committed by Gerrit - the friendly Code Review server
commit 77d3e61429
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/1.0/location_api/GnssAPIClient.cpp
View file

@ -231,6 +231,7 @@ void GnssAPIClient::gnssDeleteAidingData(IGnss::GnssAidingData aidingDataFlags)
GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT | GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT |
GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT | GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT |
GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT; GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT;
data.posEngineMask = STANDARD_POSITIONING_ENGINE;
if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL) if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL)
data.deleteAll = true; data.deleteAll = true;

1
android/1.1/location_api/GnssAPIClient.cpp
View file

@ -231,6 +231,7 @@ void GnssAPIClient::gnssDeleteAidingData(IGnss::GnssAidingData aidingDataFlags)
GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT | GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT |
GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT | GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT |
GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT; GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT;
data.posEngineMask = STANDARD_POSITIONING_ENGINE;
if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL) if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL)
data.deleteAll = true; data.deleteAll = true;

3
gnss/GnssAdapter.cpp
View file

@ -1816,12 +1816,15 @@ GnssAdapter::gnssDeleteAidingDataCommand(GnssAidingData& data)
mSessionId(sessionId), mSessionId(sessionId),
mData(data) {} mData(data) {}
inline virtual void proc() const { inline virtual void proc() const {
if ((mData.posEngineMask & STANDARD_POSITIONING_ENGINE) != 0) {
mAdapter.deleteAidingData(mData, mSessionId); mAdapter.deleteAidingData(mData, mSessionId);
SystemStatus* s = mAdapter.getSystemStatus(); SystemStatus* s = mAdapter.getSystemStatus();
if ((nullptr != s) && (mData.deleteAll)) { if ((nullptr != s) && (mData.deleteAll)) {
s->setDefaultGnssEngineStates(); s->setDefaultGnssEngineStates();
} }
}
mAdapter.mEngHubProxy->gnssDeleteAidingData(mData); mAdapter.mEngHubProxy->gnssDeleteAidingData(mData);
} }
}; };

1
location/LocationDataTypes.h
View file

@ -707,6 +707,7 @@ typedef struct {
bool deleteAll; // if true, delete all aiding data and ignore other params bool deleteAll; // if true, delete all aiding data and ignore other params
GnssAidingDataSv sv; // SV specific aiding data GnssAidingDataSv sv; // SV specific aiding data
GnssAidingDataCommon common; // common aiding data GnssAidingDataCommon common; // common aiding data
PositioningEngineMask posEngineMask; // engines to perform the delete operation on.
} GnssAidingData; } GnssAidingData;
typedef uint16_t DrCalibrationStatusMask; typedef uint16_t DrCalibrationStatusMask;