diff options
| author | Philip Milne <pmilne@google.com> | 2012-09-26 17:30:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 17:30:20 -0700 |
| commit | eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2 (patch) | |
| tree | 287c3b811b85fc063b3da3f5a0f2044d66b27261 /api | |
| parent | 0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb (diff) | |
| parent | 4118012da9a22694b3353040a485f8cdc27e2f17 (diff) | |
| download | frameworks_base-eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2.zip frameworks_base-eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2.tar.gz frameworks_base-eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2.tar.bz2 | |
Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 173dbe5..177b787 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10665,7 +10665,7 @@ package android.location { method public float getAccuracy(); method public double getAltitude(); method public float getBearing(); - method public long getElapsedRealtimeNano(); + method public long getElapsedRealtimeNanos(); method public android.os.Bundle getExtras(); method public double getLatitude(); method public double getLongitude(); @@ -10685,7 +10685,7 @@ package android.location { method public void setAccuracy(float); method public void setAltitude(double); method public void setBearing(float); - method public void setElapsedRealtimeNano(long); + method public void setElapsedRealtimeNanos(long); method public void setExtras(android.os.Bundle); method public void setLatitude(double); method public void setLongitude(double); @@ -16574,7 +16574,7 @@ package android.os { public final class SystemClock { method public static long currentThreadTimeMillis(); method public static long elapsedRealtime(); - method public static long elapsedRealtimeNano(); + method public static long elapsedRealtimeNanos(); method public static boolean setCurrentTimeMillis(long); method public static void sleep(long); method public static long uptimeMillis(); |