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 /core | |
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 'core')
-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 a54c25b..c9adf45 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 #elapsedRealtimeNano} + * <li> <p> {@link #elapsedRealtime} and {@link #elapsedRealtimeNanos} * 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 elapsedRealtimeNano(); + public static native long elapsedRealtimeNanos(); /** * Returns milliseconds running in the current thread. |