commit e7877f830bbfb50c28bad97269508805d3d9688b
author Yipeng Cao <tccyp@google.com> Mon May 22 10:57:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 22 10:57:26 2017 +0000
tree 2303c23747d2bd656ce7656959088efe8ed5b840
parent f685344bb29efa91e083ef4f3d9d371518e1fe9c
parent 98af818d035649ad84870f9bca21405ad945204a

Merge "Revert the system clock in the debug oc-dev" into oc-dev am: 4229cb80a0
am: 98af818d03

Change-Id: Id7aacffd3fa48d76003840fff8f4d48197eae936

services/core/java/com/android/server/location/GnssLocationProvider.java

diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 4ada555..4a45c07 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -943,9 +943,9 @@
                     long time = mNtpTime.getCachedNtpTime();
                     long timeReference = mNtpTime.getCachedNtpTimeReference();
                     long certainty = mNtpTime.getCacheCertainty();
-                    long now = SystemClock.elapsedRealtime();
 
                     if (DEBUG) {
+                        long now = System.currentTimeMillis();
                         Log.d(TAG, "NTP server returned: "
                                 + time + " (" + new Date(time)
                                 + ") reference: " + timeReference