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

Promotion of location.lnx.2.0-00008.

Browse source 
CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1022064   I0183608f801cdc6a7d7db730d5d633e556c95386   multiple XTRA downloaders could be triggered on boot up

Change-Id: Id991fd5614ec3fe470ef73f2880bdedc148d7090
CRs-Fixed: 1022064
This commit is contained in:
Linux Build Service Account 2016-06-16 07:49:07 -06:00
commit 7e2b283f1f
5 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/ContextBase.h
View file

@ -116,6 +116,7 @@ public:
inline LocApiProxyBase* getLocApiProxy() { return mLocApiProxy; } inline LocApiProxyBase* getLocApiProxy() { return mLocApiProxy; }
inline bool hasAgpsExtendedCapabilities() { return mLBSProxy->hasAgpsExtendedCapabilities(); } inline bool hasAgpsExtendedCapabilities() { return mLBSProxy->hasAgpsExtendedCapabilities(); }
inline bool hasCPIExtendedCapabilities() { return mLBSProxy->hasCPIExtendedCapabilities(); } inline bool hasCPIExtendedCapabilities() { return mLBSProxy->hasCPIExtendedCapabilities(); }
inline bool hasNativeXtraClient() { return mLBSProxy->hasNativeXtraClient(); }
inline void modemPowerVote(bool power) const { return mLBSProxy->modemPowerVote(power); } inline void modemPowerVote(bool power) const { return mLBSProxy->modemPowerVote(power); }
inline void requestUlp(LocAdapterBase* adapter, inline void requestUlp(LocAdapterBase* adapter,
unsigned long capabilities) { unsigned long capabilities) {

1
core/LBSProxyBase.h
View file

@ -69,6 +69,7 @@ public:
(void)context; (void)context;
} }
inline virtual bool hasNativeXtraClient() const { return false; }
inline virtual IzatDevId_t getIzatDevId() const { return 0; } inline virtual IzatDevId_t getIzatDevId() const { return 0; }
}; };

4
loc_api/libloc_api_50001/Android.mk
View file

@ -91,6 +91,10 @@ LOCAL_CFLAGS += \
-fno-short-enums \ -fno-short-enums \
-D_ANDROID_ \ -D_ANDROID_ \
ifeq ($(TARGET_BUILD_VARIANT),user)
LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER
endif
ifeq ($(TARGET_USES_QCOM_BSP), true) ifeq ($(TARGET_USES_QCOM_BSP), true)
LOCAL_CFLAGS += -DTARGET_USES_QCOM_BSP LOCAL_CFLAGS += -DTARGET_USES_QCOM_BSP
endif endif

3
loc_api/libloc_api_50001/LocEngAdapter.h
View file

@ -105,6 +105,9 @@ public:
inline bool hasCPIExtendedCapabilities() { inline bool hasCPIExtendedCapabilities() {
return mContext->hasCPIExtendedCapabilities(); return mContext->hasCPIExtendedCapabilities();
} }
inline bool hasNativeXtraClient() {
return mContext->hasNativeXtraClient();
}
inline const MsgTask* getMsgTask() { return mMsgTask; } inline const MsgTask* getMsgTask() { return mMsgTask; }
inline enum loc_api_adapter_err inline enum loc_api_adapter_err

7
loc_api/libloc_api_50001/loc_eng_xtra.cpp
View file

@ -123,6 +123,13 @@ int loc_eng_xtra_init (loc_eng_data_s_type &loc_eng_data,
loc_eng_xtra_data_s_type *xtra_module_data_ptr; loc_eng_xtra_data_s_type *xtra_module_data_ptr;
ENTRY_LOG(); ENTRY_LOG();
if(!loc_eng_data.adapter->mSupportsTimeInjection
|| loc_eng_data.adapter->hasNativeXtraClient()) {
LOC_LOGD("XTRA is already supported. disable it here.\n");
EXIT_LOG(%d, 1); // return 1 denote failure
return 1;
}
if(callbacks == NULL) { if(callbacks == NULL) {
LOC_LOGE("loc_eng_xtra_init: failed, cb is NULL"); LOC_LOGE("loc_eng_xtra_init: failed, cb is NULL");
} else { } else {