From 21176240126e90e4767b4b78589eb97cb62ad9fe Mon Sep 17 00:00:00 2001 From: Albert I Date: Fri, 25 Jun 2021 19:34:31 +0800 Subject: [PATCH] sm8450-common: gps: Reorder initializations list to satisfy warnings -Wreorder-ctor is a compile-time, Clang-only flag which is enabled by default since Clang 12, which will warn whenever a specified field will be initialized right after field specified below it. However, since it doesn't sweep through all fields, compiler may miss some of them. This order has been checked thoroughly through many trial and errors to ensure that no such warns will be triggered anymore. Change-Id: Id24cbb7277dc8d6c02767f8f365818ab6c017683 --- .../aidl-impl/location_api/GnssAPIClient.cpp | 2 +- gps/batching/BatchingAdapter.cpp | 4 +-- gps/core/LocAdapterBase.cpp | 8 ++--- gps/gnss/Agps.h | 2 +- gps/gnss/GnssAdapter.cpp | 32 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gps/android/aidl-impl/location_api/GnssAPIClient.cpp b/gps/android/aidl-impl/location_api/GnssAPIClient.cpp index 3156740..caf422c 100644 --- a/gps/android/aidl-impl/location_api/GnssAPIClient.cpp +++ b/gps/android/aidl-impl/location_api/GnssAPIClient.cpp @@ -44,8 +44,8 @@ namespace implementation { GnssAPIClient::GnssAPIClient(const shared_ptr& gpsCb) : LocationAPIClientBase(), - mControlClient(new LocationAPIControlClient()), mTracking(false), + mControlClient(new LocationAPIControlClient()), mLocationCapabilitiesMask(0), mLocationCapabilitiesCached(false), mGnssCbIface(gpsCb) { diff --git a/gps/batching/BatchingAdapter.cpp b/gps/batching/BatchingAdapter.cpp index ef2995b..bfd2198 100644 --- a/gps/batching/BatchingAdapter.cpp +++ b/gps/batching/BatchingAdapter.cpp @@ -44,11 +44,11 @@ BatchingAdapter::BatchingAdapter() : mOngoingTripTBFInterval(0), mTripWithOngoingTBFDropped(false), mTripWithOngoingTripDistanceDropped(false), + mSystemPowerState(POWER_STATE_UNKNOWN), mBatchingTimeout(0), mBatchingAccuracy(1), mBatchSize(0), - mTripBatchSize(0), - mSystemPowerState(POWER_STATE_UNKNOWN) + mTripBatchSize(0) { LOC_LOGD("%s]: Constructor", __func__); readConfigCommand(); diff --git a/gps/core/LocAdapterBase.cpp b/gps/core/LocAdapterBase.cpp index 5713fe9..1248386 100644 --- a/gps/core/LocAdapterBase.cpp +++ b/gps/core/LocAdapterBase.cpp @@ -45,10 +45,10 @@ LocAdapterBase::LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, ContextBase* context, bool isMaster, LocAdapterProxyBase *adapterProxyBase, bool waitForDoneInit) : - mIsMaster(isMaster), mEvtMask(mask), mContext(context), - mLocApi(context->getLocApi()), mLocAdapterProxyBase(adapterProxyBase), - mMsgTask(context->getMsgTask()), - mIsEngineCapabilitiesKnown(ContextBase::sIsEngineCapabilitiesKnown) + mIsMaster(isMaster), + mIsEngineCapabilitiesKnown(ContextBase::sIsEngineCapabilitiesKnown), + mEvtMask(mask), mContext(context), mLocApi(context->getLocApi()), + mLocAdapterProxyBase(adapterProxyBase), mMsgTask(context->getMsgTask()) { LOC_LOGd("waitForDoneInit: %d", waitForDoneInit); if (!waitForDoneInit) { diff --git a/gps/gnss/Agps.h b/gps/gnss/Agps.h index 5e46525..d795347 100644 --- a/gps/gnss/Agps.h +++ b/gps/gnss/Agps.h @@ -158,9 +158,9 @@ private: public: /* CONSTRUCTOR */ AgpsStateMachine(AgpsManager* agpsManager, AGpsExtType agpsType): - mFrameworkStatusV4Cb(NULL), mAgpsManager(agpsManager), mSubscriberList(), mCurrentSubscriber(NULL), mState(AGPS_STATE_RELEASED), + mFrameworkStatusV4Cb(NULL), mAgpsType(agpsType), mAPN(NULL), mAPNLen(0), mBearer(AGPS_APN_BEARER_INVALID) {}; diff --git a/gps/gnss/GnssAdapter.cpp b/gps/gnss/GnssAdapter.cpp index 5b67511..67e60fa 100644 --- a/gps/gnss/GnssAdapter.cpp +++ b/gps/gnss/GnssAdapter.cpp @@ -135,6 +135,10 @@ GnssAdapter::GnssAdapter() : mAgpsManager(), mNfwCb(NULL), mIsE911Session(NULL), + mPowerIndicationCb(nullptr), + mGnssPowerStatisticsInit(false), + mBootReferenceEnergy(0), + mPowerElapsedRealTimeCal(30000000), mIsMeasCorrInterfaceOpen(false), mIsAntennaInfoInterfaceOpened(false), mQDgnssListenerHDL(nullptr), @@ -146,6 +150,7 @@ GnssAdapter::GnssAdapter() : mCallbackPriority(OdcpiPrioritytype::ODCPI_HANDLER_PRIORITY_LOW), mOdcpiTimer(this), mOdcpiRequest(), + mAddressRequestCb(nullptr), mLastDeleteAidingDataTime(0), mSystemStatus(SystemStatus::getInstance(mMsgTask)), mServerUrl(":"), @@ -155,18 +160,13 @@ GnssAdapter::GnssAdapter() : mBlockCPIInfo{}, mPowerOn(false), mDreIntEnabled(false), + mPositionElapsedRealTimeCal(30000000), mNativeAgpsHandler(mSystemStatus->getOsObserver(), *this), mGnssEnergyConsumedCb(nullptr), mPowerStateCb(nullptr), mSendNmeaConsent(false), mDgnssState(0), - mDgnssLastNmeaBootTimeMilli(0), - mPowerIndicationCb(nullptr), - mGnssPowerStatisticsInit(false), - mBootReferenceEnergy(0), - mPowerElapsedRealTimeCal(30000000), - mAddressRequestCb(nullptr), - mPositionElapsedRealTimeCal(30000000) + mDgnssLastNmeaBootTimeMilli(0) { LOC_LOGD("%s]: Constructor %p", __func__, this); mLocPositionMode.mode = LOC_POSITION_MODE_INVALID; @@ -1696,8 +1696,8 @@ GnssAdapter::gnssGetConfigCommand(GnssConfigFlagsMask configMask) { mAdapter(adapter), mApi(api), mConfigMask(configMask), - mCount(count), - mIds(nullptr) { + mIds(nullptr), + mCount(count) { if (mCount > 0) { mIds = new uint32_t[count]; if (mIds) { @@ -4250,8 +4250,8 @@ GnssAdapter::reportLatencyInfoEvent(const GnssLatencyInfo& gnssLatencyInfo) GnssLatencyInfo mGnssLatencyInfo; inline MsgReportLatencyInfo(GnssAdapter& adapter, const GnssLatencyInfo& gnssLatencyInfo) : - mGnssLatencyInfo(gnssLatencyInfo), - mAdapter(adapter) {} + mAdapter(adapter), + mGnssLatencyInfo(gnssLatencyInfo) {} inline virtual void proc() const { mAdapter.mGnssLatencyInfoQueue.push(mGnssLatencyInfo); LOC_LOGv("mGnssLatencyInfoQueue.size after push=%zu", @@ -5583,9 +5583,9 @@ void GnssAdapter::reportPdnTypeFromWds(int pdnType, AGpsExtType agpsType, std::s inline MsgReportAtlPdn(GnssAdapter& adapter, int pdnType, AgpsManager* agpsManager, AGpsExtType agpsType, const string& apnName, AGpsBearerType bearerType) : - LocMsg(), mAgpsManager(agpsManager), mAgpsType(agpsType), - mApnName(apnName), mBearerType(bearerType), - mAdapter(adapter), mPdnType(pdnType) {} + LocMsg(), mAdapter(adapter), mPdnType(pdnType), + mAgpsManager(agpsManager), mAgpsType(agpsType), + mApnName(apnName), mBearerType(bearerType) {} inline virtual void proc() const { mAgpsManager->reportAtlOpenSuccess(mAgpsType, const_cast(mApnName.c_str()), @@ -5614,8 +5614,8 @@ void GnssAdapter::dataConnOpenCommand( inline AgpsMsgAtlOpenSuccess(GnssAdapter& adapter, AgpsManager* agpsManager, AGpsExtType agpsType, const char* apnName, int apnLen, AGpsBearerType bearerType) : - LocMsg(), mAgpsManager(agpsManager), mAgpsType(agpsType), mApnName( - new char[apnLen + 1]), mBearerType(bearerType), mAdapter(adapter) { + LocMsg(), mAdapter(adapter), mAgpsManager(agpsManager), mAgpsType(agpsType), + mApnName(new char[apnLen + 1]), mBearerType(bearerType) { LOC_LOGV("AgpsMsgAtlOpenSuccess"); if (mApnName == nullptr) {