commit 2aba2a128d4ae666672007d56aea04f034eb05ec
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 16 23:43:11 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 16 23:43:11 2022 +0000
tree 6c1ccc2f682f400e32ea04ecafc45219f4db6afe
parent 3aeb8f4925055944aca164d996075d350aa241bd
parent b9246592ee329927fa0dd51be34d93594c1a81ba

Merge "Set elapsedRealtime if HAL doesn't set it"

services/core/jni/gnss/Utils.cpp

diff --git a/services/core/jni/gnss/Utils.cpp b/services/core/jni/gnss/Utils.cpp
index 8f32c47..571534f 100644
--- a/services/core/jni/gnss/Utils.cpp
+++ b/services/core/jni/gnss/Utils.cpp
@@ -195,6 +195,8 @@
     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,