summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-09-26 11:29:25 -0700
committerPhilip Milne <pmilne@google.com>2012-09-26 11:29:25 -0700
commit4118012da9a22694b3353040a485f8cdc27e2f17 (patch)
tree310eddfb0c3ee5d1205dfbc2c72dd91fb9ffc40f /api
parent2832136bb6fcace61ef078051e94aa0a841aac15 (diff)
downloadframeworks_base-4118012da9a22694b3353040a485f8cdc27e2f17.zip
frameworks_base-4118012da9a22694b3353040a485f8cdc27e2f17.tar.gz
frameworks_base-4118012da9a22694b3353040a485f8cdc27e2f17.tar.bz2
Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index c732c3e..d5e585d 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);
@@ -16576,7 +16576,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();