From 71a2bf25935f118dc63b64ff06c53a058895a0d4 Mon Sep 17 00:00:00 2001
From: Eva Chen <evaschen@google.com>
Date: Fri, 29 Jan 2021 01:29:32 -0800
Subject: [PATCH] Change getGnssTimeMillis to use
 location.getElapsedRealtimeNanos().

Bug: 178150888
Test: LocationManagerCoarseTest#testGnssProvidedClock

Change-Id: Iac289f2ff9f9b389715166f60be0d00c8a8fac9d
---
 .../com/android/server/location/LocationManagerService.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/location/LocationManagerService.java b/services/core/java/com/android/server/location/LocationManagerService.java
index b5b93d6d8ecd9..142f64f0a5106 100644
--- a/services/core/java/com/android/server/location/LocationManagerService.java
+++ b/services/core/java/com/android/server/location/LocationManagerService.java
@@ -74,7 +74,6 @@ import android.os.ICancellationSignal;
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.RemoteException;
-import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.WorkSource;
 import android.os.WorkSource.WorkChain;
@@ -1297,10 +1296,7 @@ public class LocationManagerService extends ILocationManager.Stub {
                 return null;
             }
 
-            long currentNanos = SystemClock.elapsedRealtimeNanos();
-            long deltaMs = NANOSECONDS.toMillis(
-                    location.getElapsedRealtimeAgeNanos(currentNanos));
-            return new LocationTime(location.getTime() + deltaMs, currentNanos);
+            return new LocationTime(location.getTime(), location.getElapsedRealtimeNanos());
         }
     }