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 /core | |
| 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
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 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. |