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 /location | |
| 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 'location')
| -rw-r--r-- | location/java/android/location/Location.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index d66aa0d..672e378 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -515,7 +515,7 @@ public class Location implements Parcelable { * Return the time of this fix, in elapsed real-time since system boot. * * <p>This value can be reliably compared to - * {@link android.os.SystemClock#elapsedRealtimeNanos}, + * {@link android.os.SystemClock#elapsedRealtimeNano}, * to calculate the age of a fix and to compare Location fixes. This * is reliable because elapsed real-time is guaranteed monotonic for * each system boot and continues to increment even when the system @@ -792,7 +792,7 @@ public class Location implements Parcelable { mAccuracy = 100.0f; } if (mTime == 0) mTime = System.currentTimeMillis(); - if (mElapsedRealtimeNano == 0) mElapsedRealtimeNano = SystemClock.elapsedRealtimeNanos(); + if (mElapsedRealtimeNano == 0) mElapsedRealtimeNano = SystemClock.elapsedRealtimeNano(); } /** |