summaryrefslogtreecommitdiffstats
path: root/location/java
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-09-24 11:38:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-24 11:38:29 -0700
commit53fe75677212d0eb45e256a78599d7866256bc6a (patch)
tree9e2bacbd6cf9fa125447b697c9531d7a3583b8ac /location/java
parent2f6d8829524dfca3a77e9a57c3b9c3862209877d (diff)
downloadframeworks_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 'location/java')
-rw-r--r--location/java/android/location/Location.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java
index 83f8564..2d94ddc 100644
--- a/location/java/android/location/Location.java
+++ b/location/java/android/location/Location.java
@@ -505,7 +505,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
@@ -782,7 +782,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();
}
/**