From 8df28a63f8ad248e2c41346d68b2c9223b2803ca Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Thu, 15 Sep 2022 22:52:34 +0000
Subject: [PATCH] Set elapsedRealtime if HAL doesn't set it

Bug: 246631036
Test: manual
Change-Id: Ifefcf1448bcf59cddcf9f9aaaf4a0571030544ec
---
 services/core/jni/gnss/Utils.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/jni/gnss/Utils.cpp b/services/core/jni/gnss/Utils.cpp
index 8f32c47fcb5a8..571534f5d16e7 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,