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

Remove system status reset upon delete aiding data

Browse source 
Delete aiding data command would trigger default gnss engine state set.
Rename setDeafultReport with setDefaultGnssEngineStates and remove system
settings reset in it.

Change-Id: I7b5dffe3191b24e9f5bb6d887705fca34ed94013
CRs-fixed: 2151350
This commit is contained in:
Yingjie Wang 2017-12-21 20:03:40 +08:00
parent d519abf0c1
commit 57a5b186c5
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/SystemStatus.cpp
View file

@ -1656,7 +1656,7 @@ bool SystemStatus::getReport(SystemStatusReports& report, bool isLatestOnly) con
@return true when successfully done @return true when successfully done
******************************************************************************/ ******************************************************************************/
bool SystemStatus::setDefaultReport(void) bool SystemStatus::setDefaultGnssEngineStates(void)
{ {
pthread_mutex_lock(&mMutexSystemStatus); pthread_mutex_lock(&mMutexSystemStatus);
@ -1677,29 +1677,6 @@ bool SystemStatus::setDefaultReport(void)
setDefaultIteminReport(mCache.mPositionFailure, SystemStatusPositionFailure()); setDefaultIteminReport(mCache.mPositionFailure, SystemStatusPositionFailure());
setDefaultIteminReport(mCache.mAirplaneMode, SystemStatusAirplaneMode());
setDefaultIteminReport(mCache.mENH, SystemStatusENH());
setDefaultIteminReport(mCache.mGPSState, SystemStatusGpsState());
setDefaultIteminReport(mCache.mNLPStatus, SystemStatusNLPStatus());
setDefaultIteminReport(mCache.mWifiHardwareState, SystemStatusWifiHardwareState());
setDefaultIteminReport(mCache.mNetworkInfo, SystemStatusNetworkInfo());
setDefaultIteminReport(mCache.mRilServiceInfo, SystemStatusServiceInfo());
setDefaultIteminReport(mCache.mRilCellInfo, SystemStatusRilCellInfo());
setDefaultIteminReport(mCache.mServiceStatus, SystemStatusServiceStatus());
setDefaultIteminReport(mCache.mModel, SystemStatusModel());
setDefaultIteminReport(mCache.mManufacturer, SystemStatusManufacturer());
setDefaultIteminReport(mCache.mAssistedGps, SystemStatusAssistedGps());
setDefaultIteminReport(mCache.mScreenState, SystemStatusScreenState());
setDefaultIteminReport(mCache.mPowerConnectState, SystemStatusPowerConnectState());
setDefaultIteminReport(mCache.mTimeZoneChange, SystemStatusTimeZoneChange());
setDefaultIteminReport(mCache.mTimeChange, SystemStatusTimeChange());
setDefaultIteminReport(mCache.mWifiSupplicantStatus, SystemStatusWifiSupplicantStatus());
setDefaultIteminReport(mCache.mShutdownState, SystemStatusShutdownState());
setDefaultIteminReport(mCache.mTac, SystemStatusTac());
setDefaultIteminReport(mCache.mMccMnc, SystemStatusMccMnc());
setDefaultIteminReport(mCache.mBtDeviceScanDetail, SystemStatusBtDeviceScanDetail());
setDefaultIteminReport(mCache.mBtLeDeviceScanDetail, SystemStatusBtleDeviceScanDetail());
pthread_mutex_unlock(&mMutexSystemStatus); pthread_mutex_unlock(&mMutexSystemStatus);
return true; return true;
} }

2
core/SystemStatus.h
View file

@ -808,7 +808,7 @@ public:
bool eventDataItemNotify(IDataItemCore* dataitem); bool eventDataItemNotify(IDataItemCore* dataitem);
bool setNmeaString(const char *data, uint32_t len); bool setNmeaString(const char *data, uint32_t len);
bool getReport(SystemStatusReports& reports, bool isLatestonly = false) const; bool getReport(SystemStatusReports& reports, bool isLatestonly = false) const;
bool setDefaultReport(void); bool setDefaultGnssEngineStates(void);
bool eventConnectionStatus(bool connected, int8_t type); bool eventConnectionStatus(bool connected, int8_t type);
}; };

2
gnss/GnssAdapter.cpp
View file

@ -922,7 +922,7 @@ GnssAdapter::gnssDeleteAidingDataCommand(GnssAidingData& data)
mAdapter.reportResponse(err, mSessionId); mAdapter.reportResponse(err, mSessionId);
SystemStatus* s = mAdapter.getSystemStatus(); SystemStatus* s = mAdapter.getSystemStatus();
if ((nullptr != s) && (mData.deleteAll)) { if ((nullptr != s) && (mData.deleteAll)) {
s->setDefaultReport(); s->setDefaultGnssEngineStates();
} }
} }
}; };