Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev

Author: Philip Milne

api/current.txt

@@ -16565,7 +16565,7 @@ package android.os {
   public final class SystemClock {
     method public static long currentThreadTimeMillis();
     method public static long elapsedRealtime();
-    method public static long elapsedRealtimeNanos();
+    method public static long elapsedRealtimeNano();
     method public static boolean setCurrentTimeMillis(long);
     method public static void sleep(long);
     method public static long uptimeMillis();

core/java/android/os/SystemClock.java

@@ -50,7 +50,7 @@
  *     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 static void sleep(long ms)
      *
      * @return elapsed nanoseconds since boot.
      */
-    public static native long elapsedRealtimeNanos();
+    public static native long elapsedRealtimeNano();
 
     /**
      * Returns milliseconds running in the current thread.

location/java/android/location/Location.java

@@ -515,7 +515,7 @@ public void setTime(long time) {
      * Return the time of this fix, in elapsed real-time since system boot.
      *
      * <p>This value can be reliably compared to
-     * {@link android.os.SystemClock#elapsedRealtimeNanos},
+     * {@link android.os.SystemClock#elapsedRealtimeNano},
      * to calculate the age of a fix and to compare Location fixes. This
      * is reliable because elapsed real-time is guaranteed monotonic for
      * each system boot and continues to increment even when the system
@@ -792,7 +792,7 @@ public void makeComplete() {
             mAccuracy = 100.0f;
         }
         if (mTime == 0) mTime = System.currentTimeMillis();
-        if (mElapsedRealtimeNano == 0) mElapsedRealtimeNano = SystemClock.elapsedRealtimeNanos();
+        if (mElapsedRealtimeNano == 0) mElapsedRealtimeNano = SystemClock.elapsedRealtimeNano();
     }
 
     /**

packages/FusedLocation/src/com/android/location/fused/FusionEngine.java

@@ -215,7 +215,7 @@ private static double weighAccuracy(Location loc) {
     }
 
     private static double weighAge(Location loc) {
-        long ageSeconds = SystemClock.elapsedRealtimeNanos() - loc.getElapsedRealtimeNano();
+        long ageSeconds = SystemClock.elapsedRealtimeNano() - loc.getElapsedRealtimeNano();
         ageSeconds /= 1000000000L;
         if (ageSeconds < 0) ageSeconds = 0;
         return Math.exp(-ageSeconds * AGE_DECAY_CONSTANT_S);
@@ -266,7 +266,7 @@ private void updateFusedLocation() {
 
         // fused time - now
         fused.setTime(System.currentTimeMillis());
-        fused.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos());
+        fused.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano());
 
         // fuse altitude
         if (mGpsLocation.hasAltitude() && !mNetworkLocation.hasAltitude() &&

services/java/com/android/server/TwilightService.java

@@ -447,7 +447,7 @@ private void retrieveLocation() {
                 location.setLatitude(0);
                 location.setAccuracy(417000.0f);
                 location.setTime(System.currentTimeMillis());
-                location.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos());
+                location.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano());
 
                 if (DEBUG) {
                     Slog.d(TAG, "Estimated location from timezone: " + location);

services/java/com/android/server/location/GpsLocationProvider.java

@@ -1029,7 +1029,7 @@ private void reportLocation(int flags, double latitude, double longitude, double
                 mLocation.setTime(timestamp);
                 // It would be nice to push the elapsed real-time timestamp
                 // further down the stack, but this is still useful
-                mLocation.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNanos());
+                mLocation.setElapsedRealtimeNano(SystemClock.elapsedRealtimeNano());
             }
             if ((flags & LOCATION_HAS_ALTITUDE) == LOCATION_HAS_ALTITUDE) {
                 mLocation.setAltitude(altitude);