Revert "Merging m_master changes to oe_master".

This reverts commit 1aeb6bad84c0afd0e032c3d4d7e33959501e18f1

Change-Id: Iec0a96e7cdfe55ef5836c92a2ae1cce407f6cd5e

1 files changed, 9 insertions, 32 deletions

diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp
index 8fdb8cb..054a295 100644
--- a/core/LocAdapterBase.cpp
+++ b/core/LocAdapterBase.cpp
@@ -32,8 +32,7 @@
 #include <dlfcn.h>
 #include <LocAdapterBase.h>
 #include <loc_target.h>
-#include <log_util.h>
-#include <LocAdapterProxyBase.h>
+#include <platform_lib_includes.h>
 
 namespace loc_core {
 
@@ -42,45 +41,27 @@ namespace loc_core {
 // But if getLocApi(targetEnumType target) is overriden,
 // the right locApi should get created.
 LocAdapterBase::LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask,
-                               ContextBase* context, LocAdapterProxyBase *adapterProxyBase) :
+                               ContextBase* context) :
     mEvtMask(mask), mContext(context),
-    mLocApi(context->getLocApi()), mLocAdapterProxyBase(adapterProxyBase),
-    mMsgTask(context->getMsgTask())
+    mLocApi(context->getLocApi()), mMsgTask(context->getMsgTask())
 {
     mLocApi->addAdapter(this);
 }
 
-void LocAdapterBase::handleEngineUpEvent()
-{
-    if (mLocAdapterProxyBase) {
-        mLocAdapterProxyBase->handleEngineUpEvent();
-    }
-}
-
-void LocAdapterBase::handleEngineDownEvent()
-{
-    if (mLocAdapterProxyBase) {
-        mLocAdapterProxyBase->handleEngineDownEvent();
-    }
-}
+void LocAdapterBase::
+    handleEngineDownEvent()
+DEFAULT_IMPL()
 
 void LocAdapterBase::
     reportPosition(UlpLocation &location,
                    GpsLocationExtended &locationExtended,
                    void* locationExt,
                    enum loc_sess_status status,
-                   LocPosTechMask loc_technology_mask) {
-    if (mLocAdapterProxyBase == NULL ||
-        !mLocAdapterProxyBase->reportPosition(location,
-                                              locationExtended,
-                                              status,
-                                              loc_technology_mask)) {
-        DEFAULT_IMPL()
-    }
-}
+                   LocPosTechMask loc_technology_mask)
+DEFAULT_IMPL()
 
 void LocAdapterBase::
-    reportSv(GnssSvStatus &svStatus,
+    reportSv(GpsSvStatus &svStatus,
              GpsLocationExtended &locationExtended,
              void* svExt)
 DEFAULT_IMPL()
@@ -135,8 +116,4 @@ DEFAULT_IMPL(false)
 bool LocAdapterBase::
     requestNiNotify(GpsNiNotification &notify, const void* data)
 DEFAULT_IMPL(false)
-
-void LocAdapterBase::
-    reportGpsMeasurementData(GpsData &gpsMeasurementData)
-DEFAULT_IMPL()
 } // namespace loc_core