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 /location | |
| 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 '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 672e378..d66aa0d 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#elapsedRealtimeNano}, + * {@link android.os.SystemClock#elapsedRealtimeNanos}, * 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.elapsedRealtimeNano(); + if (mElapsedRealtimeNano == 0) mElapsedRealtimeNano = SystemClock.elapsedRealtimeNanos(); } /** |