diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2014-07-09 03:00:30 +0000 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-07-09 03:10:58 +0000 |
| commit | 0ed9ab19618e840907e343877bf91bd30aba8be9 (patch) | |
| tree | 720011feb395d5d3bea568a19a91d080823d0cb7 /core/LocDualContext.h | |
| parent | 544e9a17d2aed484e797b7cde001a9c7390acd74 (diff) | |
| download | gps-0ed9ab19618e840907e343877bf91bd30aba8be9.tar.gz | |
Revert "Merge branch 'KK.04.04.02.010.399' into l-pdk"
This reverts commit 8c61f8c1f1572ab769912264af3f31feb041fe79.
Change-Id: I488b164f36f6f6be55aebb4759c116a3b4a1e448
Diffstat (limited to 'core/LocDualContext.h')
| -rw-r--r-- | core/LocDualContext.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/LocDualContext.h b/core/LocDualContext.h index cdc4df3..e761e76 100644 --- a/core/LocDualContext.h +++ b/core/LocDualContext.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2013, 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* mLBSLibName; + static const char* mIzatLibName; static const LOC_API_ADAPTER_EVENT_MASK_T mFgExclMask; static const LOC_API_ADAPTER_EVENT_MASK_T mBgExclMask; static const char* mLocationHalName; @@ -65,7 +65,6 @@ public: const char* name); static ContextBase* getLocBgContext(MsgTask::tAssociate tAssociate, const char* name); - static void injectFeatureConfig(ContextBase *context); }; } |