summaryrefslogtreecommitdiffstats
path: root/packages/FusedLocation/src
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-09-21 14:21:27 -0700
committerPhilip Milne <pmilne@google.com>2012-09-21 15:54:41 -0700
commit2f6d8829524dfca3a77e9a57c3b9c3862209877d (patch)
tree15bd455fb9ed48e4246a475855c9ad7d0a15d94b /packages/FusedLocation/src
parentf98db0de2248ad286b207eed6a826373cc60b786 (diff)
downloadframeworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.zip
frameworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.tar.gz
frameworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.tar.bz2
Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: I71c24ea10093ece07a0780e97bc641ff548c1a44
Diffstat (limited to 'packages/FusedLocation/src')
-rw-r--r--packages/FusedLocation/src/com/android/location/fused/FusionEngine.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
index 1c22c7a..d2dfe3b 100644
--- a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
+++ b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
@@ -215,7 +215,7 @@ public class FusionEngine implements LocationListener {
}
private static double weighAge(Location loc) {
- long ageSeconds = SystemClock.elapsedRealtimeNano() - loc.getElapsedRealtimeNano();
+ long ageSeconds = SystemClock.elapsedRealtimeNanos() - loc.getElapsedRealtimeNano();
ageSeconds /= 1000000000L;
if (ageSeconds < 0) ageSeconds = 0;
return Math.exp(-ageSeconds * AGE_DECAY_CONSTANT_S);
@@ -266,7 +266,7 @@ public class FusionEngine implements LocationListener {
// fused time - now
fused.setTime(System.currentTimeMillis());
- fused.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano());
+ fused.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos());
// fuse altitude
if (mGpsLocation.hasAltitude() && !mNetworkLocation.hasAltitude() &&