diff options
| author | Philip Milne <pmilne@google.com> | 2012-09-24 11:38:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 11:38:29 -0700 |
| commit | 53fe75677212d0eb45e256a78599d7866256bc6a (patch) | |
| tree | 9e2bacbd6cf9fa125447b697c9531d7a3583b8ac /packages/FusedLocation | |
| parent | 2f6d8829524dfca3a77e9a57c3b9c3862209877d (diff) | |
| download | frameworks_base-53fe75677212d0eb45e256a78599d7866256bc6a.zip frameworks_base-53fe75677212d0eb45e256a78599d7866256bc6a.tar.gz frameworks_base-53fe75677212d0eb45e256a78599d7866256bc6a.tar.bz2 | |
Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
This reverts commit 2f6d8829524dfca3a77e9a57c3b9c3862209877d
Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
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 d2dfe3b..1c22c7a 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() && |