summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-16 23:43:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-16 23:43:11 +0000
commit2aba2a128d4ae666672007d56aea04f034eb05ec (patch)
tree6c1ccc2f682f400e32ea04ecafc45219f4db6afe
parent3aeb8f4925055944aca164d996075d350aa241bd (diff)
parentb9246592ee329927fa0dd51be34d93594c1a81ba (diff)
Merge "Set elapsedRealtime if HAL doesn't set it"
-rw-r--r--services/core/jni/gnss/Utils.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/jni/gnss/Utils.cpp b/services/core/jni/gnss/Utils.cpp
index 8f32c47fcb5a..571534f5d16e 100644
--- a/services/core/jni/gnss/Utils.cpp
+++ b/services/core/jni/gnss/Utils.cpp
@@ -195,6 +195,8 @@ jobject translateGnssLocation(JNIEnv* env, const android::hardware::gnss::GnssLo
flags = static_cast<uint32_t>(location.elapsedRealtime.flags);
if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIMESTAMP_NS) {
SET(ElapsedRealtimeNanos, location.elapsedRealtime.timestampNs);
+ } else {
+ SET(ElapsedRealtimeNanos, android::elapsedRealtimeNano());
}
if (flags & android::hardware::gnss::ElapsedRealtime::HAS_TIME_UNCERTAINTY_NS) {
SET(ElapsedRealtimeUncertaintyNanos,