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

Commit 1b173b29 authored by Shinru Han's avatar Shinru Han Committed by Android (Google) Code Review
Browse files

Merge "Use Galileo IonosphericModel for GalileoAssistance" into main

parents 99c323bf a6df7fbc

location/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ package android.location { 


  public static final class BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime implements android.os.Parcelable {

    method public int describeContents();

    method @IntRange(from=0, to=31) public int getAode();

    method @IntRange(from=0) public int getBeidouWeekNumber();

    method @IntRange(from=0, to=31) public int getIode();

    method @IntRange(from=0, to=604792) public int getToeSeconds();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime> CREATOR;
@@ -106,8 +106,8 @@ package android.location { 
  public static final class BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder {

    ctor public BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder();

    method @NonNull public android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime build();

    method @NonNull public android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder setAode(int);

    method @NonNull public android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder setBeidouWeekNumber(@IntRange(from=0) int);

    method @NonNull public android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder setIode(int);

    method @NonNull public android.location.BeidouSatelliteEphemeris.BeidouSatelliteEphemerisTime.Builder setToeSeconds(@IntRange(from=0, to=604792) int);

  }
@@ -177,7 +177,7 @@ package android.location { 
    method public int describeContents();

    method @Nullable public android.location.GnssAlmanac getAlmanac();

    method @Nullable public android.location.AuxiliaryInformation getAuxiliaryInformation();

    method @Nullable public android.location.KlobucharIonosphericModel getIonosphericModel();

    method @Nullable public android.location.GalileoIonosphericModel getIonosphericModel();

    method @Nullable public android.location.LeapSecondsModel getLeapSecondsModel();

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();

    method @NonNull public java.util.List<android.location.GnssAssistance.GnssSatelliteCorrections> getSatelliteCorrections();
@@ -193,7 +193,7 @@ package android.location { 
    method @NonNull public android.location.GalileoAssistance build();

    method @NonNull public android.location.GalileoAssistance.Builder setAlmanac(@Nullable android.location.GnssAlmanac);

    method @NonNull public android.location.GalileoAssistance.Builder setAuxiliaryInformation(@Nullable android.location.AuxiliaryInformation);

    method @NonNull public android.location.GalileoAssistance.Builder setIonosphericModel(@Nullable android.location.KlobucharIonosphericModel);

    method @NonNull public android.location.GalileoAssistance.Builder setIonosphericModel(@Nullable android.location.GalileoIonosphericModel);

    method @NonNull public android.location.GalileoAssistance.Builder setLeapSecondsModel(@Nullable android.location.LeapSecondsModel);

    method @NonNull public android.location.GalileoAssistance.Builder setRealTimeIntegrityModels(@NonNull java.util.List<android.location.RealTimeIntegrityModel>);

    method @NonNull public android.location.GalileoAssistance.Builder setSatelliteCorrections(@NonNull java.util.List<android.location.GnssAssistance.GnssSatelliteCorrections>);

location/java/android/location/BeidouSatelliteEphemeris.java

+11 −11
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 
         *

         * <p>This is defined in BDS-SIS-ICD-B1I-3.0 section 5.2.4.11 Table 5-8.

         */

        private final int mIode;

        private final int mAode;



        /** Beidou week number without rollover */

        private final int mBeidouWeekNumber;
@@ -540,18 +540,18 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 
        private final int mToeSeconds;



        private BeidouSatelliteEphemerisTime(Builder builder) {

            Preconditions.checkArgumentInRange(builder.mIode, 0, 31, "Iode");

            Preconditions.checkArgumentInRange(builder.mAode, 0, 31, "Aode");

            Preconditions.checkArgument(builder.mBeidouWeekNumber >= 0);

            Preconditions.checkArgumentInRange(builder.mToeSeconds, 0, 604792, "ToeSeconds");

            mIode = builder.mIode;

            mAode = builder.mAode;

            mBeidouWeekNumber = builder.mBeidouWeekNumber;

            mToeSeconds = builder.mToeSeconds;

        }



        /** Returns the AODE Age of Data, Ephemeris. */

        @IntRange(from = 0, to = 31)

        public int getIode() {

            return mIode;

        public int getAode() {

            return mAode;

        }



        /** Returns the Beidou week number without rollover . */
@@ -573,7 +573,7 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 
                    public BeidouSatelliteEphemerisTime createFromParcel(Parcel in) {

                        final BeidouSatelliteEphemerisTime.Builder beidouSatelliteEphemerisTime =

                                new Builder()

                                        .setIode(in.readInt())

                                        .setAode(in.readInt())

                                        .setBeidouWeekNumber(in.readInt())

                                        .setToeSeconds(in.readInt());

                        return beidouSatelliteEphemerisTime.build();
@@ -592,7 +592,7 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 


        @Override

        public void writeToParcel(@NonNull Parcel parcel, int flags) {

            parcel.writeInt(mIode);

            parcel.writeInt(mAode);

            parcel.writeInt(mBeidouWeekNumber);

            parcel.writeInt(mToeSeconds);

        }
@@ -600,7 +600,7 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 
        @Override

        public String toString() {

            StringBuilder builder = new StringBuilder("BeidouSatelliteEphemerisTime[");

            builder.append("iode = ").append(mIode);

            builder.append("aode = ").append(mAode);

            builder.append(", beidouWeekNumber = ").append(mBeidouWeekNumber);

            builder.append(", toeSeconds = ").append(mToeSeconds);

            builder.append("]");
@@ -609,14 +609,14 @@ public final class BeidouSatelliteEphemeris implements Parcelable { 


        /** Builder for {@link BeidouSatelliteEphemerisTime} */

        public static final class Builder {

            private int mIode;

            private int mAode;

            private int mBeidouWeekNumber;

            private int mToeSeconds;



            /** Sets the AODE Age of Data, Ephemeris. */

            @NonNull

            public Builder setIode(int iode) {

                mIode = iode;

            public Builder setAode(int iode) {

                mAode = iode;

                return this;

            }

location/java/android/location/GalileoAssistance.java

+8 −8
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ public final class GalileoAssistance implements Parcelable { 
    /** The Galileo almanac. */

    @Nullable private final GnssAlmanac mAlmanac;



    /** The Klobuchar ionospheric model. */

    @Nullable private final KlobucharIonosphericModel mIonosphericModel;

    /** The Galileo ionospheric model. */

    @Nullable private final GalileoIonosphericModel mIonosphericModel;



    /** The UTC model. */

    @Nullable private final UtcModel mUtcModel;
@@ -102,9 +102,9 @@ public final class GalileoAssistance implements Parcelable { 
        return mAlmanac;

    }



    /** Returns the Klobuchar ionospheric model. */

    /** Returns the Galileo ionospheric model. */

    @Nullable

    public KlobucharIonosphericModel getIonosphericModel() {

    public GalileoIonosphericModel getIonosphericModel() {

        return mIonosphericModel;

    }
@@ -192,7 +192,7 @@ public final class GalileoAssistance implements Parcelable { 
                    return new GalileoAssistance.Builder()

                            .setAlmanac(in.readTypedObject(GnssAlmanac.CREATOR))

                            .setIonosphericModel(

                                    in.readTypedObject(KlobucharIonosphericModel.CREATOR))

                                    in.readTypedObject(GalileoIonosphericModel.CREATOR))

                            .setUtcModel(in.readTypedObject(UtcModel.CREATOR))

                            .setLeapSecondsModel(in.readTypedObject(LeapSecondsModel.CREATOR))

                            .setAuxiliaryInformation(
@@ -216,7 +216,7 @@ public final class GalileoAssistance implements Parcelable { 
    /** Builder for {@link GalileoAssistance}. */

    public static final class Builder {

        private GnssAlmanac mAlmanac;

        private KlobucharIonosphericModel mIonosphericModel;

        private GalileoIonosphericModel mIonosphericModel;

        private UtcModel mUtcModel;

        private LeapSecondsModel mLeapSecondsModel;

        private AuxiliaryInformation mAuxiliaryInformation;
@@ -232,9 +232,9 @@ public final class GalileoAssistance implements Parcelable { 
            return this;

        }



        /** Sets the Klobuchar ionospheric model. */

        /** Sets the Galileo ionospheric model. */

        @NonNull

        public Builder setIonosphericModel(@Nullable KlobucharIonosphericModel ionosphericModel) {

        public Builder setIonosphericModel(@Nullable GalileoIonosphericModel ionosphericModel) {

            mIonosphericModel = ionosphericModel;

            return this;

        }