am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev

* commit '3d52eb7f1dde460d547fc20ec0b93465d69ec496':
  Fix Batched Scan Results to give Timestamp in uS

1 files changed, 3 insertions, 1 deletions

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 0f1aa71..ad89716 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -65,6 +65,7 @@ import android.os.PowerManager;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.WorkSource;
@@ -1016,7 +1017,7 @@ public class WifiStateMachine extends StateMachine {
             int dist, distSd;
             long tsf = 0;
             dist = distSd = ScanResult.UNSPECIFIED;
-            long now = System.currentTimeMillis();
+            long now = SystemClock.elapsedRealtime();
 
             while (true) {
                 while (n < splitData.length) {
@@ -1064,6 +1065,7 @@ public class WifiStateMachine extends StateMachine {
                     } else if (splitData[n].startsWith(AGE)) {
                         try {
                             tsf = now - Long.parseLong(splitData[n].substring(AGE.length()));
+                            tsf *= 1000; // convert mS -> uS
                         } catch (NumberFormatException e) {
                             loge("Invalid timestamp: " + splitData[n]);
                             tsf = 0;