Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2013-09-13 00:04:30 +00:00
committed by Android (Google) Code Review
parent 5fbfb81d31 dee971b98c
commit 14e5599672
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiStateMachine.java
View File

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