diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-07-23 03:46:37 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-07-23 03:46:37 -0700 |
| commit | 7195c406547cbc34f9b28ff95e0cc325e1f5646a (patch) | |
| tree | d0c952d82c9dfaecd7a95bd7ffddcb34ec3cc8bc | |
| parent | 7931c2ef3306072374d7f1f0a5517d8b5dee0999 (diff) | |
| parent | d7e0299494a1c46f84c91962372e855626870ab4 (diff) | |
Merge d7e0299494a1c46f84c91962372e855626870ab4 on remote branch
Change-Id: I99e8d6b39c40349119fff0fba170efccffe6ecd5
| -rw-r--r-- | batching/BatchingAdapter.cpp | 8 | ||||
| -rw-r--r-- | etc/gnss_antenna_info.conf | 3 | ||||
| -rw-r--r-- | geofence/GeofenceAdapter.cpp | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/batching/BatchingAdapter.cpp b/batching/BatchingAdapter.cpp index d9f7945..4f1a43c 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), @@ -50,6 +52,10 @@ BatchingAdapter::BatchingAdapter() : LOC_LOGD("%s]: Constructor", __func__); readConfigCommand(); setConfigCommand(); + + // at last step, let us inform adapater base that we are done + // with initialization, e.g.: ready to process handleEngineUpEvent + doneInit(); } void diff --git a/etc/gnss_antenna_info.conf b/etc/gnss_antenna_info.conf index 79a2aef..e037daa 100644 --- a/etc/gnss_antenna_info.conf +++ b/etc/gnss_antenna_info.conf @@ -80,7 +80,8 @@ # NUMBER_OF_ROWS_SGC_ and NUMBER_OF_COLUMNS_SGC_ represent the number of # rows/columns for signal gain corrections -ANTENNA_INFO_VECTOR_SIZE = 2 +# ANTENNA_INFO_VECTOR_SIZE must be non zero if antenna corrections are sent +# ANTENNA_INFO_VECTOR_SIZE = 2 CARRIER_FREQUENCY_0 = 1575.42 diff --git a/geofence/GeofenceAdapter.cpp b/geofence/GeofenceAdapter.cpp index f024e3f..1aeea0a 100644 --- a/geofence/GeofenceAdapter.cpp +++ b/geofence/GeofenceAdapter.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2020, 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,9 +38,13 @@ 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 + // with initialization, e.g.: ready to process handleEngineUpEvent + doneInit(); } void |