diff options
| author | Philip Milne <pmilne@google.com> | 2012-09-24 11:41:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 11:41:53 -0700 |
| commit | bc391d58c8d09bd58b57dda20dd9d2281d90db32 (patch) | |
| tree | a2229a1a1b02535f6ee5ae3ddaba76db9cb7a93e /packages/FusedLocation | |
| parent | 9b93f4def131845200997c861858f34cc15c8dee (diff) | |
| parent | 53fe75677212d0eb45e256a78599d7866256bc6a (diff) | |
| download | frameworks_base-bc391d58c8d09bd58b57dda20dd9d2281d90db32.zip frameworks_base-bc391d58c8d09bd58b57dda20dd9d2281d90db32.tar.gz frameworks_base-bc391d58c8d09bd58b57dda20dd9d2281d90db32.tar.bz2 | |
Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev
Diffstat (limited to 'packages/FusedLocation')
| -rw-r--r-- | packages/FusedLocation/src/com/android/location/fused/FusionEngine.java | 4 |
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 0397952..b83521a 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.elapsedRealtimeNanos() - loc.getElapsedRealtimeNano(); + long ageSeconds = SystemClock.elapsedRealtimeNano() - 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.elapsedRealtimeNanos()); + fused.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano()); // fuse altitude if (mGpsLocation.hasAltitude() && !mNetworkLocation.hasAltitude() && |