diff options
| author | Xin Li <delphij@google.com> | 2022-03-08 00:18:42 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-03-08 00:18:42 +0000 |
| commit | 248b22823b632cc0216a10c0622cb55d0692b952 (patch) | |
| tree | 64172d8ac3230ec509af61098c92286fd28a07ab | |
| parent | 37fdd3d2a62eb921c43d2309ed5089fbb81be9f3 (diff) | |
| parent | 9af21d1e0087bb7ca1e77591d00083d2bd547fd7 (diff) | |
| download | gps-248b22823b632cc0216a10c0622cb55d0692b952.tar.gz | |
Merge Android 12L
Bug: 222710654
Merged-In: I376afc92b74ac4185154307ecb6125e92006e281
Change-Id: I8b89e64a5c5c19c31c50b50aa29f20d4ab55e7f8
| -rw-r--r-- | batching/BatchingAdapter.cpp | 4 | ||||
| -rw-r--r-- | geofence/GeofenceAdapter.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/batching/BatchingAdapter.cpp b/batching/BatchingAdapter.cpp index d1bd308..e36ed45 100644 --- a/batching/BatchingAdapter.cpp +++ b/batching/BatchingAdapter.cpp @@ -37,7 +37,9 @@ using namespace loc_core; BatchingAdapter::BatchingAdapter() : - LocAdapterBase(0, LocContext::getLocContext(LocContext::mLocationHalName)), + LocAdapterBase(0, + LocContext::getLocContext(LocContext::mLocationHalName), + false, nullptr, true), mOngoingTripDistance(0), mOngoingTripTBFInterval(0), mTripWithOngoingTBFDropped(false), diff --git a/geofence/GeofenceAdapter.cpp b/geofence/GeofenceAdapter.cpp index fa45e88..9349acd 100644 --- a/geofence/GeofenceAdapter.cpp +++ b/geofence/GeofenceAdapter.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019, 2021 The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2021, 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 @@ -38,7 +38,7 @@ using namespace loc_core; GeofenceAdapter::GeofenceAdapter() : LocAdapterBase(0, LocContext::getLocContext(LocContext::mLocationHalName), - true /*isMaster*/) + true /*isMaster*/, nullptr, true) { LOC_LOGD("%s]: Constructor", __func__); // at last step, let us inform adapater base that we are done |