diff options
| author | Dante Russo <drusso@codeaurora.org> | 2014-06-27 13:14:39 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-07-08 16:46:17 -0700 |
| commit | 8c61f8c1f1572ab769912264af3f31feb041fe79 (patch) | |
| tree | ba884b1be1972a097332eca198dc083ba786dd8d /core/LocDualContext.h | |
| parent | 4fe12bb6925e1372f441ec5a79c7c8f316ff06bd (diff) | |
| download | gps-8c61f8c1f1572ab769912264af3f31feb041fe79.tar.gz | |
Merge branch 'KK.04.04.02.010.399' into l-pdk
Change-Id: I2452a378d4a4697cec2b023a0e9a9bf3e5f14924
Diffstat (limited to 'core/LocDualContext.h')
| -rw-r--r-- | core/LocDualContext.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/LocDualContext.h b/core/LocDualContext.h index e761e76..cdc4df3 100644 --- a/core/LocDualContext.h +++ b/core/LocDualContext.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -40,7 +40,7 @@ class LocDualContext : public ContextBase { static const MsgTask* mMsgTask; static ContextBase* mFgContext; static ContextBase* mBgContext; - + static ContextBase* mInjectContext; static const MsgTask* getMsgTask(MsgTask::tCreate tCreator, const char* name); static const MsgTask* getMsgTask(MsgTask::tAssociate tAssociate, @@ -52,7 +52,7 @@ protected: inline virtual ~LocDualContext() {} public: - static const char* mIzatLibName; + static const char* mLBSLibName; static const LOC_API_ADAPTER_EVENT_MASK_T mFgExclMask; static const LOC_API_ADAPTER_EVENT_MASK_T mBgExclMask; static const char* mLocationHalName; @@ -65,6 +65,7 @@ public: const char* name); static ContextBase* getLocBgContext(MsgTask::tAssociate tAssociate, const char* name); + static void injectFeatureConfig(ContextBase *context); }; } |