From f58ae31d1b0b50315b3fb7a82e3d22f3c40d7e53 Mon Sep 17 00:00:00 2001 From: Baili Feng Date: Tue, 2 Aug 2016 18:19:55 +0800 Subject: [PATCH] Remove deprecated api LocEngExtPowerConfig LocEngExtPowerConfig is no longer necessary. Remove it from libloc_eng. CRs-fixed: 1047042 Change-Id: I4a053e13a571f4a373899559d82e144f9bc82582 --- core/LocApiBase.cpp | 4 ---- core/LocApiBase.h | 2 -- loc_api/libloc_api_50001/LocEngAdapter.h | 5 ----- loc_api/libloc_api_50001/loc_eng.cpp | 23 ----------------------- 4 files changed, 34 deletions(-) diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index d52f27bd..fdfc537b 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -515,10 +515,6 @@ enum loc_api_adapter_err LocApiBase:: int algorithmConfig) DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) -enum loc_api_adapter_err LocApiBase:: - setExtPowerConfig(int isBatteryCharging) -DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) - enum loc_api_adapter_err LocApiBase:: setAGLONASSProtocol(unsigned long aGlonassProtocol) DEFAULT_IMPL(LOC_API_ADAPTER_ERR_SUCCESS) diff --git a/core/LocApiBase.h b/core/LocApiBase.h index 8849b1fc..066695ca 100644 --- a/core/LocApiBase.h +++ b/core/LocApiBase.h @@ -204,8 +204,6 @@ public: int gyroSamplesPerBatchHigh, int gyroBatchesPerSecHigh, int algorithmConfig); - virtual enum loc_api_adapter_err - setExtPowerConfig(int isBatteryCharging); virtual enum loc_api_adapter_err setAGLONASSProtocol(unsigned long aGlonassProtocol); virtual enum loc_api_adapter_err diff --git a/loc_api/libloc_api_50001/LocEngAdapter.h b/loc_api/libloc_api_50001/LocEngAdapter.h index 60af647e..416e4b70 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.h +++ b/loc_api/libloc_api_50001/LocEngAdapter.h @@ -229,11 +229,6 @@ public: gyroSamplesPerBatchHigh, gyroBatchesPerSecHigh, algorithmConfig); } - inline virtual enum loc_api_adapter_err - setExtPowerConfig(int isBatteryCharging) - { - return mLocApi->setExtPowerConfig(isBatteryCharging); - } inline virtual enum loc_api_adapter_err setAGLONASSProtocol(unsigned long aGlonassProtocol) { diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index 79ed037e..c1cc640b 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -757,29 +757,6 @@ struct LocEngSensorPerfControlConfig : public LocMsg { } }; -// case LOC_ENG_MSG_EXT_POWER_CONFIG: -struct LocEngExtPowerConfig : public LocMsg { - LocEngAdapter* mAdapter; - const int mIsBatteryCharging; - inline LocEngExtPowerConfig(LocEngAdapter* adapter, - int isBatteryCharging) : - LocMsg(), mAdapter(adapter), - mIsBatteryCharging(isBatteryCharging) - { - locallog(); - } - inline virtual void proc() const { - mAdapter->setExtPowerConfig(mIsBatteryCharging); - } - inline void locallog() const { - LOC_LOGV("LocEngExtPowerConfig - isBatteryCharging: %d", - mIsBatteryCharging); - } - inline virtual void log() const { - locallog(); - } -}; - // case LOC_ENG_MSG_REPORT_POSITION: LocEngReportPosition::LocEngReportPosition(LocAdapterBase* adapter, UlpLocation &loc,