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

Commit 979a2b76 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Change TimeOfClock and TimeOfEphemeris to long 

Change TOC and TOE definition to
1. long
2. time in seconds since GPS epoch, regardless of constellation
3. must not be encoded

Bug: 219575003
Test: atest SatellitePvtTest
Change-Id: Ic663e45adafbd1778528a985c1670898d5653e00
parent f08068fe

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5830,8 +5830,8 @@ package android.location { 
    method @IntRange(from=0, to=1023) public int getIssueOfDataClock();

    method @IntRange(from=0, to=255) public int getIssueOfDataEphemeris();

    method @Nullable public android.location.SatellitePvt.PositionEcef getPositionEcef();

    method @IntRange(from=0, to=604784) public int getTimeOfClock();

    method @IntRange(from=0, to=604784) public int getTimeOfEphemeris();

    method @IntRange(from=0) public long getTimeOfClock();

    method @IntRange(from=0) public long getTimeOfEphemeris();

    method @FloatRange public double getTropoDelayMeters();

    method @Nullable public android.location.SatellitePvt.VelocityEcef getVelocityEcef();

    method public boolean hasIono();
@@ -5858,8 +5858,8 @@ package android.location { 
    method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataClock(@IntRange(from=0, to=1023) int);

    method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataEphemeris(@IntRange(from=0, to=255) int);

    method @NonNull public android.location.SatellitePvt.Builder setPositionEcef(@NonNull android.location.SatellitePvt.PositionEcef);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfClock(@IntRange(from=0, to=604784) int);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemeris(@IntRange(from=0, to=604784) int);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfClock(@IntRange(from=0) long);

    method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemeris(@IntRange(from=0) int);

    method @NonNull public android.location.SatellitePvt.Builder setTropoDelayMeters(@FloatRange(from=0.0f, to=100.0f) double);

    method @NonNull public android.location.SatellitePvt.Builder setVelocityEcef(@NonNull android.location.SatellitePvt.VelocityEcef);

  }

location/java/android/location/SatellitePvt.java

+35 −28
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ public final class SatellitePvt implements Parcelable { 
    private final ClockInfo mClockInfo;

    private final double mIonoDelayMeters;

    private final double mTropoDelayMeters;

    private final int mTimeOfClock;

    private final int mTimeOfEphemeris;

    private final long mTimeOfClock;

    private final long mTimeOfEphemeris;

    private final int mIssueOfDataClock;

    private final int mIssueOfDataEphemeris;

    @EphemerisSource
@@ -457,8 +457,8 @@ public final class SatellitePvt implements Parcelable { 
            @Nullable ClockInfo clockInfo,

            double ionoDelayMeters,

            double tropoDelayMeters,

            int timeOfClock,

            int timeOfEphemeris,

            long timeOfClock,

            long timeOfEphemeris,

            int issueOfDataClock,

            int issueOfDataEphemeris,

            @EphemerisSource int ephemerisSource) {
@@ -547,26 +547,28 @@ public final class SatellitePvt implements Parcelable { 
    /**

     * Time of Clock.

     *

     * <p>This is defined in GPS ICD200 documentation (e.g.,

     * <a href="https://www.gps.gov/technical/icwg/IS-GPS-200H.pdf"></a>).

     * <p>The value is in seconds since GPS epoch, regardless of the constellation.

     *

     * <p>The value is not encoded as in GPS ICD200 documentation.

     *

     * <p>This field is valid if {@link #hasTimeOfClock()} is true.

     */

    @IntRange(from = 0, to = 604784)

    public int getTimeOfClock() {

    @IntRange(from = 0)

    public long getTimeOfClock() {

        return mTimeOfClock;

    }



    /**

     * Time of ephemeris.

     *

     * <p>This is defined in GPS ICD200 documentation (e.g.,

     * <a href="https://www.gps.gov/technical/icwg/IS-GPS-200H.pdf"></a>).

     * <p>The value is in seconds since GPS epoch, regardless of the constellation.

     *

     * <p>The value is not encoded as in GPS ICD200 documentation.

     *

     * <p>This field is valid if {@link #hasTimeOfEphemeris()} is true.

     */

    @IntRange(from = 0, to = 604784)

    public int getTimeOfEphemeris() {

    @IntRange(from = 0)

    public long getTimeOfEphemeris() {

        return mTimeOfEphemeris;

    }
@@ -630,8 +632,8 @@ public final class SatellitePvt implements Parcelable { 
                            android.location.SatellitePvt.ClockInfo.class);

                    double ionoDelayMeters = in.readDouble();

                    double tropoDelayMeters = in.readDouble();

                    int toc = in.readInt();

                    int toe = in.readInt();

                    long toc = in.readLong();

                    long toe = in.readLong();

                    int iodc = in.readInt();

                    int iode = in.readInt();

                    int ephemerisSource = in.readInt();
@@ -669,8 +671,8 @@ public final class SatellitePvt implements Parcelable { 
        parcel.writeParcelable(mClockInfo, flags);

        parcel.writeDouble(mIonoDelayMeters);

        parcel.writeDouble(mTropoDelayMeters);

        parcel.writeInt(mTimeOfClock);

        parcel.writeInt(mTimeOfEphemeris);

        parcel.writeLong(mTimeOfClock);

        parcel.writeLong(mTimeOfEphemeris);

        parcel.writeInt(mIssueOfDataClock);

        parcel.writeInt(mIssueOfDataEphemeris);

        parcel.writeInt(mEphemerisSource);
@@ -707,8 +709,8 @@ public final class SatellitePvt implements Parcelable { 
        @Nullable private ClockInfo mClockInfo;

        private double mIonoDelayMeters;

        private double mTropoDelayMeters;

        private int mTimeOfClock;

        private int mTimeOfEphemeris;

        private long mTimeOfClock;

        private long mTimeOfEphemeris;

        private int mIssueOfDataClock;

        private int mIssueOfDataEphemeris;

        @EphemerisSource
@@ -721,8 +723,7 @@ public final class SatellitePvt implements Parcelable { 
         * @return builder object

         */

        @NonNull

        public Builder setPositionEcef(

                @NonNull PositionEcef positionEcef) {

        public Builder setPositionEcef(@NonNull PositionEcef positionEcef) {

            mPositionEcef = positionEcef;

            updateFlags();

            return this;
@@ -735,8 +736,7 @@ public final class SatellitePvt implements Parcelable { 
         * @return builder object

         */

        @NonNull

        public Builder setVelocityEcef(

                @NonNull VelocityEcef velocityEcef) {

        public Builder setVelocityEcef(@NonNull VelocityEcef velocityEcef) {

            mVelocityEcef = velocityEcef;

            updateFlags();

            return this;
@@ -749,8 +749,7 @@ public final class SatellitePvt implements Parcelable { 
         * @return builder object

         */

        @NonNull

        public Builder setClockInfo(

                @NonNull ClockInfo clockInfo) {

        public Builder setClockInfo(@NonNull ClockInfo clockInfo) {

            mClockInfo = clockInfo;

            updateFlags();

            return this;
@@ -793,12 +792,16 @@ public final class SatellitePvt implements Parcelable { 
        /**

         * Set time of clock in seconds.

         *

         * <p>The value is in seconds since GPS epoch, regardless of the constellation.

         *

         * <p>The value is not encoded as in GPS ICD200 documentation.

         *

         * @param timeOfClock time of clock (seconds)

         * @return builder object

         */

        @NonNull

        public Builder setTimeOfClock(@IntRange(from = 0, to = 604784) int timeOfClock) {

            Preconditions.checkArgumentInRange(timeOfClock, 0, 604784, "timeOfClock");

        public Builder setTimeOfClock(@IntRange(from = 0) long timeOfClock) {

            Preconditions.checkArgumentNonnegative(timeOfClock);

            mTimeOfClock = timeOfClock;

            mFlags = (byte) (mFlags | HAS_TIME_OF_CLOCK);

            return this;
@@ -807,12 +810,16 @@ public final class SatellitePvt implements Parcelable { 
        /**

         * Set time of ephemeris in seconds.

         *

         * <p>The value is in seconds since GPS epoch, regardless of the constellation.

         *

         * <p>The value is not encoded as in GPS ICD200 documentation.

         *

         * @param timeOfEphemeris time of ephemeris (seconds)

         * @return builder object

         */

        @NonNull

        public Builder setTimeOfEphemeris(@IntRange(from = 0, to = 604784) int timeOfEphemeris) {

            Preconditions.checkArgumentInRange(timeOfEphemeris, 0, 604784, "timeOfEphemeris");

        public Builder setTimeOfEphemeris(@IntRange(from = 0) int timeOfEphemeris) {

            Preconditions.checkArgumentNonnegative(timeOfEphemeris);

            mTimeOfEphemeris = timeOfEphemeris;

            mFlags = (byte) (mFlags | HAS_TIME_OF_EPHEMERIS);

            return this;