diff options
| author | Philip Milne <pmilne@google.com> | 2012-09-24 11:02:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 11:02:31 -0700 |
| commit | b00df8e929f9ba865a95a7df3f949e6169332954 (patch) | |
| tree | 403858cba43361e6ca1a9a4d955929f4b671e2a0 /packages/FusedLocation/src | |
| parent | cd11b223f3d23ca0f92b53808f7e1cce928c2a7b (diff) | |
| parent | 2f6d8829524dfca3a77e9a57c3b9c3862209877d (diff) | |
| download | frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.zip frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.tar.gz frameworks_base-b00df8e929f9ba865a95a7df3f949e6169332954.tar.bz2 | |
Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
Diffstat (limited to 'packages/FusedLocation/src')
| -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 b83521a..0397952 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() && |