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 | |
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
6 files changed, 9 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index 4da8098..ac27f03 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16560,7 +16560,7 @@ package android.os { public final class SystemClock { method public static long currentThreadTimeMillis(); method public static long elapsedRealtime(); - method public static long elapsedRealtimeNanos(); + method public static long elapsedRealtimeNano(); method public static boolean setCurrentTimeMillis(long); method public static void sleep(long); method public static long uptimeMillis(); diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index c9adf45..a54c25b 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -50,7 +50,7 @@ package android.os; * interval does not span device sleep. Most methods that accept a * timestamp value currently expect the {@link #uptimeMillis} clock. * - * <li> <p> {@link #elapsedRealtime} and {@link #elapsedRealtimeNanos} + * <li> <p> {@link #elapsedRealtime} and {@link #elapsedRealtimeNano} * return the time since the system was booted, and include deep sleep. * This clock is guaranteed to be monotonic, and continues to tick even * when the CPU is in power saving modes, so is the recommend basis @@ -157,7 +157,7 @@ public final class SystemClock { * * @return elapsed nanoseconds since boot. */ - public static native long elapsedRealtimeNanos(); + public static native long elapsedRealtimeNano(); /** * Returns milliseconds running in the current thread. 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(); } /** 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() && diff --git a/services/java/com/android/server/TwilightService.java b/services/java/com/android/server/TwilightService.java index f313f48..a7bce54 100644 --- a/services/java/com/android/server/TwilightService.java +++ b/services/java/com/android/server/TwilightService.java @@ -447,7 +447,7 @@ public final class TwilightService { location.setLatitude(0); location.setAccuracy(417000.0f); location.setTime(System.currentTimeMillis()); - location.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos()); + location.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano()); if (DEBUG) { Slog.d(TAG, "Estimated location from timezone: " + location); diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java index 1702f88..bb11fe7 100755 --- a/services/java/com/android/server/location/GpsLocationProvider.java +++ b/services/java/com/android/server/location/GpsLocationProvider.java @@ -1029,7 +1029,7 @@ public class GpsLocationProvider implements LocationProviderInterface { mLocation.setTime(timestamp); // It would be nice to push the elapsed real-time timestamp // further down the stack, but this is still useful - mLocation.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos()); + mLocation.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano()); } if ((flags & LOCATION_HAS_ALTITUDE) == LOCATION_HAS_ALTITUDE) { mLocation.setAltitude(altitude); |