From 57a5b186c529aa99e365d7a4c781bda3e39e1ee8 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Thu, 21 Dec 2017 20:03:40 +0800 Subject: [PATCH] Remove system status reset upon delete aiding data 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 --- core/SystemStatus.cpp | 25 +------------------------ core/SystemStatus.h | 2 +- gnss/GnssAdapter.cpp | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/core/SystemStatus.cpp b/core/SystemStatus.cpp index 9e8f1e17..4d0c7ede 100644 --- a/core/SystemStatus.cpp +++ b/core/SystemStatus.cpp @@ -1656,7 +1656,7 @@ bool SystemStatus::getReport(SystemStatusReports& report, bool isLatestOnly) con @return true when successfully done ******************************************************************************/ -bool SystemStatus::setDefaultReport(void) +bool SystemStatus::setDefaultGnssEngineStates(void) { pthread_mutex_lock(&mMutexSystemStatus); @@ -1677,29 +1677,6 @@ bool SystemStatus::setDefaultReport(void) 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); return true; } diff --git a/core/SystemStatus.h b/core/SystemStatus.h index e4d06dab..7e3309df 100644 --- a/core/SystemStatus.h +++ b/core/SystemStatus.h @@ -808,7 +808,7 @@ public: bool eventDataItemNotify(IDataItemCore* dataitem); bool setNmeaString(const char *data, uint32_t len); bool getReport(SystemStatusReports& reports, bool isLatestonly = false) const; - bool setDefaultReport(void); + bool setDefaultGnssEngineStates(void); bool eventConnectionStatus(bool connected, int8_t type); }; diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 2ba131e5..c1e55ad1 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -922,7 +922,7 @@ GnssAdapter::gnssDeleteAidingDataCommand(GnssAidingData& data) mAdapter.reportResponse(err, mSessionId); SystemStatus* s = mAdapter.getSystemStatus(); if ((nullptr != s) && (mData.deleteAll)) { - s->setDefaultReport(); + s->setDefaultGnssEngineStates(); } } };