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

Merge "Fixed KW issues such as uninitialized variables"

Browse source
This commit is contained in:
Linux Build Service Account 2018-09-16 02:35:30 -07:00 committed by Gerrit - the friendly Code Review server
commit ee2ccdb172
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnss/GnssAdapter.cpp
View file

@ -2280,6 +2280,7 @@ GnssAdapter::startTrackingMultiplex(LocationAPI* client, uint32_t sessionId,
// find the smallest interval and powerMode // find the smallest interval and powerMode
TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time
GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID; GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID;
memset(&multiplexedOptions, 0, sizeof(multiplexedOptions));
for (auto it = mTrackingSessions.begin(); it != mTrackingSessions.end(); ++it) { for (auto it = mTrackingSessions.begin(); it != mTrackingSessions.end(); ++it) {
// if not set or there is a new smallest interval, then set the new interval // if not set or there is a new smallest interval, then set the new interval
if (0 == multiplexedOptions.size || if (0 == multiplexedOptions.size ||
@ -2470,6 +2471,7 @@ GnssAdapter::updateTrackingMultiplex(LocationAPI* client, uint32_t id,
// find the smallest interval and powerMode, other than the session we are updating // find the smallest interval and powerMode, other than the session we are updating
TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time
GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID; GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID;
memset(&multiplexedOptions, 0, sizeof(multiplexedOptions));
for (auto it2 = mTrackingSessions.begin(); it2 != mTrackingSessions.end(); ++it2) { for (auto it2 = mTrackingSessions.begin(); it2 != mTrackingSessions.end(); ++it2) {
// if session is not the one we are updating and either interval // if session is not the one we are updating and either interval
// is not set or there is a new smallest interval, then set the new interval // is not set or there is a new smallest interval, then set the new interval
@ -2569,6 +2571,7 @@ GnssAdapter::stopTrackingMultiplex(LocationAPI* client, uint32_t id)
// find the smallest interval and powerMode, other than the session we are stopping // find the smallest interval and powerMode, other than the session we are stopping
TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time TrackingOptions multiplexedOptions = {}; // size is 0 until set for the first time
GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID; GnssPowerMode multiplexedPowerMode = GNSS_POWER_MODE_INVALID;
memset(&multiplexedOptions, 0, sizeof(multiplexedOptions));
for (auto it2 = mTrackingSessions.begin(); it2 != mTrackingSessions.end(); ++it2) { for (auto it2 = mTrackingSessions.begin(); it2 != mTrackingSessions.end(); ++it2) {
// if session is not the one we are stopping and either interval // if session is not the one we are stopping and either interval
// is not set or there is a new smallest interval, then set the new interval // is not set or there is a new smallest interval, then set the new interval
@ -2873,6 +2876,7 @@ GnssAdapter::reportPositionEvent(const UlpLocation& ulpLocation,
mStatus(status), mStatus(status),
mTechMask(techMask), mTechMask(techMask),
mMsInWeek(msInWeek) { mMsInWeek(msInWeek) {
memset(&mDataNotify, 0, sizeof(mDataNotify));
if (pDataNotify != nullptr) { if (pDataNotify != nullptr) {
mDataNotify = *pDataNotify; mDataNotify = *pDataNotify;
mbIsDataValid = true; mbIsDataValid = true;