From b082fd7f7b113eea91a6a8756bb3991dda7b0491 Mon Sep 17 00:00:00 2001 From: Kevin Tang Date: Wed, 27 Feb 2019 14:44:29 -0800 Subject: allow a isMaster client in LocAdapterProxyBase ctor This would allow GeofenceAdapter become a master adapter, in case it gets created before GnssAdapter. Change-Id: I9eb55b7fac9970fd11d4e34bdf7cf824e5b1c586 CRs-Fixed: 2403691 --- core/LocAdapterBase.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'core/LocAdapterBase.h') diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h index e4f7be2..97e0b4a 100644 --- a/core/LocAdapterBase.h +++ b/core/LocAdapterBase.h @@ -69,15 +69,11 @@ protected: inline LocAdapterBase(const MsgTask* msgTask) : mIsMaster(false), mEvtMask(0), mContext(NULL), mLocApi(NULL), mLocAdapterProxyBase(NULL), mMsgTask(msgTask) {} - LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, - ContextBase* context, bool isMaster, - LocAdapterProxyBase *adapterProxyBase = NULL); public: inline virtual ~LocAdapterBase() { mLocApi->removeAdapter(this); } - inline LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, - ContextBase* context, - LocAdapterProxyBase *adapterProxyBase = NULL) : - LocAdapterBase(mask, context, false, adapterProxyBase) {} + LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask, + ContextBase* context, bool isMaster = false, + LocAdapterProxyBase *adapterProxyBase = NULL); inline LOC_API_ADAPTER_EVENT_MASK_T checkMask(LOC_API_ADAPTER_EVENT_MASK_T mask) const { -- cgit v1.2.3