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 /core/java | |
| 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 'core/java')
| -rw-r--r-- | core/java/android/os/SystemClock.java | 4 |
1 files changed, 2 insertions, 2 deletions
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. |