summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2021-01-07 18:39:40 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2021-01-07 18:39:40 -0800
commit7925800cc00b382bfda17edf1cdac14b9ad303a7 (patch)
tree3e5fad55e2371177d73b09cde7c4c4d07fd74cc5
parentf12ef701397089229defaf6be341fcf2f9d5eed0 (diff)
parent7cd16d52eb210a6efbbbd9d51d4adcd8c048d746 (diff)
Merge "Fix one mul-overflow issue"
-rw-r--r--core/LocApiBase.cpp2
-rw-r--r--core/LocApiBase.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index 2413d05..ebd46d6 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -930,7 +930,7 @@ void LocApiBase::
DEFAULT_IMPL()
int64_t ElapsedRealtimeEstimator::getElapsedRealtimeEstimateNanos(int64_t curDataTimeNanos,
- bool isCurDataTimeTrustable, uint32_t tbf) {
+ bool isCurDataTimeTrustable, int64_t tbf) {
//The algorithm works follow below steps:
//When isCurDataTimeTrustable is meet (means Modem timestamp is already stable),
//1, Wait for mFixTimeStablizationThreshold fixes; While waiting for modem time
diff --git a/core/LocApiBase.h b/core/LocApiBase.h
index b58e60d..121f795 100644
--- a/core/LocApiBase.h
+++ b/core/LocApiBase.h
@@ -359,7 +359,7 @@ public:
ElapsedRealtimeEstimator(int64_t travelTimeNanosEstimate):
mInitialTravelTime(travelTimeNanosEstimate) {reset();}
int64_t getElapsedRealtimeEstimateNanos(int64_t curDataTimeNanos,
- bool isCurDataTimeTrustable, uint32_t tbf);
+ bool isCurDataTimeTrustable, int64_t tbf);
inline int64_t getElapsedRealtimeUncNanos() { return 5000000;}
void reset();