commit 082b3960183cf9eea196133db4999adb16b664a5
author Philip Milne <pmilne@google.com> Wed Sep 26 11:12:21 2012 -0700
committer Philip Milne <pmilne@google.com> Wed Sep 26 11:12:21 2012 -0700
tree 108f1ff6d2553b62b565ffee5512dceb2ee0ce8c
parent 06a64fd04a9de6d93455fec384ab98e068d662a5

Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()

Change-Id: I79a54ea21da945fa1d470b2b024213ddb7269b67

apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
index 3bbb783..56a3b44 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
@@ -61,9 +61,9 @@
             if (location.getAccuracy() <= 0.0) {
                 fail(mProvider + " location has invalid accuracy: " + location.getAccuracy());
             }
-            if (location.getElapsedRealtimeNano() <= 0) {
+            if (location.getElapsedRealtimeNanos() <= 0) {
                 fail(mProvider + " location has invalid elapsed realtime: " +
-                        location.getElapsedRealtimeNano());
+                        location.getElapsedRealtimeNanos());
             }
 
             if (mNumActiveUpdates != 1 && delta < mMinActiveInterval) {
@@ -111,9 +111,9 @@
             if (location.getAccuracy() <= 0.0) {
                 fail(mProvider + " location has invalid accuracy: " + location.getAccuracy());
             }
-            if (location.getElapsedRealtimeNano() <= 0) {
+            if (location.getElapsedRealtimeNanos() <= 0) {
                 fail(mProvider + " location has invalid elapsed realtime: " +
-                        location.getElapsedRealtimeNano());
+                        location.getElapsedRealtimeNanos());
             }
 
             if (mNumPassiveUpdates != 1 && delta < mMinPassiveInterval) {

tests/tests/location/src/android/location/cts/LocationManagerTest.java

diff --git a/tests/tests/location/src/android/location/cts/LocationManagerTest.java b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
index 0fc9b4d..4b489a9 100755
--- a/tests/tests/location/src/android/location/cts/LocationManagerTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
@@ -685,7 +685,7 @@
         location.setLongitude(longitude);
         location.setAccuracy(1.0f);
         location.setTime(java.lang.System.currentTimeMillis());
-        location.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano());
+        location.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
         mManager.setTestProviderLocation(providerName, location);
     }