Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee1d3f39 authored by Philip Milne's avatar Philip Milne Committed by Android Git Automerger
Browse files

am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() ->... 

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

* commit 'bc391d58':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
parents d65fc7f8 bc391d58

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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 #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 final class SystemClock { 
     *

     * @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

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ public class Location implements Parcelable { 
     * 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 class Location implements Parcelable { 
            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

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ public class FusionEngine implements LocationListener { 
    }



    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 @@ public class FusionEngine implements LocationListener { 


        // 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

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ public final class TwilightService { 
                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);