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

Commit f1f8a751 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clarify method names and improve debug" am: 1ab7ac7f am: 1d74b820 am: a6a82197 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2217306



Change-Id: If9182dd9cf8c31229b1cf2048111204a9b6411a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c26ef968 a6a82197

core/java/android/os/SystemClock.java

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ public final class SystemClock { 
                }

                long currentNanos = elapsedRealtimeNanos();

                long deltaMs = (currentNanos - time.getElapsedRealtimeNanos()) / 1000000L;

                return time.getTime() + deltaMs;

                return time.getUnixEpochTimeMillis() + deltaMs;

            }

        };

    }

location/java/android/location/LocationTime.java

+24 −10
Original line number Diff line number Diff line
@@ -20,28 +20,32 @@ import android.annotation.NonNull; 
import android.os.Parcel;

import android.os.Parcelable;



import java.time.Duration;

import java.time.Instant;



/**

 * Data class for passing location derived time.

 * Data class for passing GNSS-derived time.

 * @hide

 */

public final class LocationTime implements Parcelable {



    private final long mTime;

    private final long mUnixEpochTimeMillis;

    private final long mElapsedRealtimeNanos;



    public LocationTime(long time, long elapsedRealtimeNanos) {

        mTime = time;

    public LocationTime(long unixEpochTimeMillis, long elapsedRealtimeNanos) {

        mUnixEpochTimeMillis = unixEpochTimeMillis;

        mElapsedRealtimeNanos = elapsedRealtimeNanos;

    }



    /**

     * The current time, according to the Gnss location provider. */

    public long getTime() {

        return mTime;

     * The Unix epoch time in millis, according to the Gnss location provider.

     */

    public long getUnixEpochTimeMillis() {

        return mUnixEpochTimeMillis;

    }



    /**

     * The elapsed nanos since boot {@link #getTime} was computed at.

     * The elapsed nanos since boot when {@link #getUnixEpochTimeMillis} was the current time.

     */

    public long getElapsedRealtimeNanos() {

        return mElapsedRealtimeNanos;
@@ -49,7 +53,7 @@ public final class LocationTime implements Parcelable { 


    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeLong(mTime);

        out.writeLong(mUnixEpochTimeMillis);

        out.writeLong(mElapsedRealtimeNanos);

    }
@@ -58,8 +62,18 @@ public final class LocationTime implements Parcelable { 
        return 0;

    }



    @Override

    public String toString() {

        return "LocationTime{"

                + "mUnixEpochTimeMillis=" + Instant.ofEpochMilli(mUnixEpochTimeMillis)

                + "(" + mUnixEpochTimeMillis + ")"

                + ", mElapsedRealtimeNanos=" + Duration.ofNanos(mElapsedRealtimeNanos)

                + "(" + mElapsedRealtimeNanos + ")"

                + '}';

    }



    public static final @NonNull Parcelable.Creator<LocationTime> CREATOR =

            new Parcelable.Creator<LocationTime>() {

            new Parcelable.Creator<>() {

                public LocationTime createFromParcel(Parcel in) {

                    long time = in.readLong();

                    long elapsedRealtimeNanos = in.readLong();

services/core/java/com/android/server/timedetector/GnssTimeUpdateService.java

+3 −2
Original line number Diff line number Diff line
@@ -261,10 +261,11 @@ public final class GnssTimeUpdateService extends Binder { 
    private void suggestGnssTime(LocationTime locationTime) {

        logDebug("suggestGnssTime()");



        long gnssTime = locationTime.getTime();

        long gnssUnixEpochTimeMillis = locationTime.getUnixEpochTimeMillis();

        long elapsedRealtimeMs = locationTime.getElapsedRealtimeNanos() / 1_000_000L;



        TimestampedValue<Long> timeSignal = new TimestampedValue<>(elapsedRealtimeMs, gnssTime);

        TimestampedValue<Long> timeSignal =

                new TimestampedValue<>(elapsedRealtimeMs, gnssUnixEpochTimeMillis);

        mLastSuggestedGnssTime = timeSignal;



        GnssTimeSuggestion timeSuggestion = new GnssTimeSuggestion(timeSignal);