diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-03-30 13:17:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-03-30 13:17:26 -0700 |
| commit | 93c1afca1c659e1fa95d88949b5645ea25aa7521 (patch) | |
| tree | 569ffff7c57aab7d40fb5b44f3459ece9b092ea2 /android | |
| parent | af57363c10827ecb183bf4a576a24241f67294cd (diff) | |
| parent | 5c1e23cf022ab1c06f4601bf0f2d8ca652784b87 (diff) | |
| download | gps-93c1afca1c659e1fa95d88949b5645ea25aa7521.tar.gz | |
Merge "Batching and Geofence moved to GNSS HAL"
Diffstat (limited to 'android')
| -rw-r--r-- | android/1.0/location_api/GnssAPIClient.cpp | 8 | ||||
| -rw-r--r-- | android/1.1/location_api/GnssAPIClient.cpp | 8 | ||||
| -rw-r--r-- | android/2.0/location_api/GnssAPIClient.cpp | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/android/1.0/location_api/GnssAPIClient.cpp b/android/1.0/location_api/GnssAPIClient.cpp index d04939e..a36d2b4 100644 --- a/android/1.0/location_api/GnssAPIClient.cpp +++ b/android/1.0/location_api/GnssAPIClient.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2017-2019, 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 @@ -36,7 +36,7 @@ #include "LocationUtil.h" #include "GnssAPIClient.h" -#include <LocDualContext.h> +#include <LocContext.h> namespace android { namespace hardware { @@ -110,9 +110,9 @@ void GnssAPIClient::gnssUpdateCallbacks(const sp<IGnssCallback>& gpsCb, locationCallbacks.gnssNiCb = nullptr; loc_core::ContextBase* context = - loc_core::LocDualContext::getLocFgContext( + loc_core::LocContext::getLocContext( NULL, NULL, - loc_core::LocDualContext::mLocationHalName, false); + loc_core::LocContext::mLocationHalName, false); if (mGnssNiCbIface != nullptr && !context->hasAgpsExtendedCapabilities()) { LOC_LOGD("Registering NI CB"); locationCallbacks.gnssNiCb = [this](uint32_t id, GnssNiNotification gnssNiNotification) { diff --git a/android/1.1/location_api/GnssAPIClient.cpp b/android/1.1/location_api/GnssAPIClient.cpp index fcef459..89877e5 100644 --- a/android/1.1/location_api/GnssAPIClient.cpp +++ b/android/1.1/location_api/GnssAPIClient.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2017-2019, 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 @@ -36,7 +36,7 @@ #include "LocationUtil.h" #include "GnssAPIClient.h" -#include <LocDualContext.h> +#include <LocContext.h> namespace android { namespace hardware { @@ -110,9 +110,9 @@ void GnssAPIClient::gnssUpdateCallbacks(const sp<IGnssCallback>& gpsCb, locationCallbacks.gnssNiCb = nullptr; loc_core::ContextBase* context = - loc_core::LocDualContext::getLocFgContext( + loc_core::LocContext::getLocContext( NULL, NULL, - loc_core::LocDualContext::mLocationHalName, false); + loc_core::LocContext::mLocationHalName, false); if (mGnssNiCbIface != nullptr && !context->hasAgpsExtendedCapabilities()) { LOC_LOGD("Registering NI CB"); locationCallbacks.gnssNiCb = [this](uint32_t id, GnssNiNotification gnssNiNotification) { diff --git a/android/2.0/location_api/GnssAPIClient.cpp b/android/2.0/location_api/GnssAPIClient.cpp index ceb0aa4..44ae284 100644 --- a/android/2.0/location_api/GnssAPIClient.cpp +++ b/android/2.0/location_api/GnssAPIClient.cpp @@ -36,7 +36,7 @@ #include "LocationUtil.h" #include "GnssAPIClient.h" -#include <LocDualContext.h> +#include <LocContext.h> namespace android { namespace hardware { @@ -110,9 +110,9 @@ void GnssAPIClient::gnssUpdateCallbacks(const sp<IGnssCallback>& gpsCb, locationCallbacks.gnssNiCb = nullptr; loc_core::ContextBase* context = - loc_core::LocDualContext::getLocFgContext( + loc_core::LocContext::getLocContext( NULL, NULL, - loc_core::LocDualContext::mLocationHalName, false); + loc_core::LocContext::mLocationHalName, false); if (mGnssNiCbIface != nullptr && !context->hasAgpsExtendedCapabilities()) { LOC_LOGD("Registering NI CB"); locationCallbacks.gnssNiCb = [this](uint32_t id, GnssNiNotification gnssNiNotification) { |