summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-09-21 14:21:27 -0700
committerPhilip Milne <pmilne@google.com>2012-09-21 15:54:41 -0700
commit2f6d8829524dfca3a77e9a57c3b9c3862209877d (patch)
tree15bd455fb9ed48e4246a475855c9ad7d0a15d94b /core
parentf98db0de2248ad286b207eed6a826373cc60b786 (diff)
downloadframeworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.zip
frameworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.tar.gz
frameworks_base-2f6d8829524dfca3a77e9a57c3b9c3862209877d.tar.bz2
Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: I71c24ea10093ece07a0780e97bc641ff548c1a44
Diffstat (limited to 'core')
-rw-r--r--core/java/android/os/SystemClock.java4
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.