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

Commit 987859fb authored by Shinru Han's avatar Shinru Han
Browse files

Add RealTimeIntegrityModel to Glonass 

- Add RealTimeIntegrityModel to Glonass
- AuxiliaryInformation should be list

Test: atest CtsLocationNoneTestCases
Bug: 404694257
Flag: android.location.flags.gnss_assistance_interface

Change-Id: If4b23317c9e882d55c069aa44affba99791afd3b
parent 3c1807f1

location/api/system-current.txt

+12 −10
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ package android.location { 
  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class BeidouAssistance implements android.os.Parcelable {

    method public int describeContents();

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

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

    method @NonNull public java.util.List<android.location.AuxiliaryInformation> getAuxiliaryInformation();

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

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -48,7 +48,7 @@ package android.location { 
    ctor public BeidouAssistance.Builder();

    method @NonNull public android.location.BeidouAssistance build();

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

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

    method @NonNull public android.location.BeidouAssistance.Builder setAuxiliaryInformation(@NonNull java.util.List<android.location.AuxiliaryInformation>);

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

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

    method @NonNull public android.location.BeidouAssistance.Builder setRealTimeIntegrityModels(@NonNull java.util.List<android.location.RealTimeIntegrityModel>);
@@ -176,7 +176,7 @@ package android.location { 
  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class GalileoAssistance implements android.os.Parcelable {

    method public int describeContents();

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

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

    method @NonNull public java.util.List<android.location.AuxiliaryInformation> getAuxiliaryInformation();

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

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -192,7 +192,7 @@ package android.location { 
    ctor public GalileoAssistance.Builder();

    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 setAuxiliaryInformation(@NonNull java.util.List<android.location.AuxiliaryInformation>);

    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>);
@@ -346,7 +346,8 @@ package android.location { 
  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class GlonassAssistance implements android.os.Parcelable {

    method public int describeContents();

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

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

    method @NonNull public java.util.List<android.location.AuxiliaryInformation> getAuxiliaryInformation();

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

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

    method @NonNull public java.util.List<android.location.GlonassSatelliteEphemeris> getSatelliteEphemeris();

    method @NonNull public java.util.List<android.location.TimeModel> getTimeModels();
@@ -359,7 +360,8 @@ package android.location { 
    ctor public GlonassAssistance.Builder();

    method @NonNull public android.location.GlonassAssistance build();

    method @NonNull public android.location.GlonassAssistance.Builder setAlmanac(@Nullable android.location.GlonassAlmanac);

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

    method @NonNull public android.location.GlonassAssistance.Builder setAuxiliaryInformation(@NonNull java.util.List<android.location.AuxiliaryInformation>);

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

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

    method @NonNull public android.location.GlonassAssistance.Builder setSatelliteEphemeris(@NonNull java.util.List<android.location.GlonassSatelliteEphemeris>);

    method @NonNull public android.location.GlonassAssistance.Builder setTimeModels(@NonNull java.util.List<android.location.TimeModel>);
@@ -717,7 +719,7 @@ package android.location { 
  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class GpsAssistance implements android.os.Parcelable {

    method public int describeContents();

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

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

    method @NonNull public java.util.List<android.location.AuxiliaryInformation> getAuxiliaryInformation();

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

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -733,7 +735,7 @@ package android.location { 
    ctor public GpsAssistance.Builder();

    method @NonNull public android.location.GpsAssistance build();

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

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

    method @NonNull public android.location.GpsAssistance.Builder setAuxiliaryInformation(@NonNull java.util.List<android.location.AuxiliaryInformation>);

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

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

    method @NonNull public android.location.GpsAssistance.Builder setRealTimeIntegrityModels(@NonNull java.util.List<android.location.RealTimeIntegrityModel>);
@@ -1253,7 +1255,7 @@ package android.location { 
  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class QzssAssistance implements android.os.Parcelable {

    method public int describeContents();

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

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

    method @NonNull public java.util.List<android.location.AuxiliaryInformation> getAuxiliaryInformation();

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

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -1269,7 +1271,7 @@ package android.location { 
    ctor public QzssAssistance.Builder();

    method @NonNull public android.location.QzssAssistance build();

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

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

    method @NonNull public android.location.QzssAssistance.Builder setAuxiliaryInformation(@NonNull java.util.List<android.location.AuxiliaryInformation>);

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

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

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

location/java/android/location/BeidouAssistance.java

+16 −11
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ public final class BeidouAssistance implements Parcelable { 
    /** The leap seconds model. */

    @Nullable private final LeapSecondsModel mLeapSecondsModel;



    /** The auxiliary information. */

    @Nullable private final AuxiliaryInformation mAuxiliaryInformation;

    /** The list of auxiliary informations. */

    @NonNull private final List<AuxiliaryInformation> mAuxiliaryInformation;



    /** The list of time models. */

    @NonNull private final List<TimeModel> mTimeModels;
@@ -70,7 +70,12 @@ public final class BeidouAssistance implements Parcelable { 
        mIonosphericModel = builder.mIonosphericModel;

        mUtcModel = builder.mUtcModel;

        mLeapSecondsModel = builder.mLeapSecondsModel;

        mAuxiliaryInformation = builder.mAuxiliaryInformation;

        if (builder.mAuxiliaryInformation != null) {

            mAuxiliaryInformation =

                    Collections.unmodifiableList(new ArrayList<>(builder.mAuxiliaryInformation));

        } else {

            mAuxiliaryInformation = new ArrayList<>();

        }

        if (builder.mTimeModels != null) {

            mTimeModels = Collections.unmodifiableList(new ArrayList<>(builder.mTimeModels));

        } else {
@@ -120,9 +125,9 @@ public final class BeidouAssistance implements Parcelable { 
        return mLeapSecondsModel;

    }



    /** Returns the auxiliary information. */

    @Nullable

    public AuxiliaryInformation getAuxiliaryInformation() {

    /** Returns the list of auxiliary informations. */

    @NonNull

    public List<AuxiliaryInformation> getAuxiliaryInformation() {

        return mAuxiliaryInformation;

    }
@@ -178,7 +183,7 @@ public final class BeidouAssistance implements Parcelable { 
        dest.writeTypedObject(mIonosphericModel, flags);

        dest.writeTypedObject(mUtcModel, flags);

        dest.writeTypedObject(mLeapSecondsModel, flags);

        dest.writeTypedObject(mAuxiliaryInformation, flags);

        dest.writeTypedList(mAuxiliaryInformation);

        dest.writeTypedList(mTimeModels);

        dest.writeTypedList(mSatelliteEphemeris);

        dest.writeTypedList(mRealTimeIntegrityModels);
@@ -196,7 +201,7 @@ public final class BeidouAssistance implements Parcelable { 
                            .setUtcModel(in.readTypedObject(UtcModel.CREATOR))

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

                            .setAuxiliaryInformation(

                                    in.readTypedObject(AuxiliaryInformation.CREATOR))

                                    in.createTypedArrayList(AuxiliaryInformation.CREATOR))

                            .setTimeModels(in.createTypedArrayList(TimeModel.CREATOR))

                            .setSatelliteEphemeris(

                                    in.createTypedArrayList(BeidouSatelliteEphemeris.CREATOR))
@@ -219,7 +224,7 @@ public final class BeidouAssistance implements Parcelable { 
        private KlobucharIonosphericModel mIonosphericModel;

        private UtcModel mUtcModel;

        private LeapSecondsModel mLeapSecondsModel;

        private AuxiliaryInformation mAuxiliaryInformation;

        private List<AuxiliaryInformation> mAuxiliaryInformation;

        private List<TimeModel> mTimeModels;

        private List<BeidouSatelliteEphemeris> mSatelliteEphemeris;

        private List<RealTimeIntegrityModel> mRealTimeIntegrityModels;
@@ -253,10 +258,10 @@ public final class BeidouAssistance implements Parcelable { 
            return this;

        }



        /** Sets the auxiliary information. */

        /** Sets the list of auxiliary informations. */

        @NonNull

        public Builder setAuxiliaryInformation(

                @Nullable AuxiliaryInformation auxiliaryInformation) {

                @NonNull List<AuxiliaryInformation> auxiliaryInformation) {

            mAuxiliaryInformation = auxiliaryInformation;

            return this;

        }

location/java/android/location/GalileoAssistance.java

+16 −11
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ public final class GalileoAssistance implements Parcelable { 
    /** The leap seconds model. */

    @Nullable private final LeapSecondsModel mLeapSecondsModel;



    /** The auxiliary information. */

    @Nullable private final AuxiliaryInformation mAuxiliaryInformation;

    /** The list of auxiliary informations. */

    @NonNull private final List<AuxiliaryInformation> mAuxiliaryInformation;



    /** The list of time models. */

    @NonNull private final List<TimeModel> mTimeModels;
@@ -70,7 +70,12 @@ public final class GalileoAssistance implements Parcelable { 
        mIonosphericModel = builder.mIonosphericModel;

        mUtcModel = builder.mUtcModel;

        mLeapSecondsModel = builder.mLeapSecondsModel;

        mAuxiliaryInformation = builder.mAuxiliaryInformation;

        if (builder.mAuxiliaryInformation != null) {

            mAuxiliaryInformation =

                    Collections.unmodifiableList(new ArrayList<>(builder.mAuxiliaryInformation));

        } else {

            mAuxiliaryInformation = new ArrayList<>();

        }

        if (builder.mTimeModels != null) {

            mTimeModels = Collections.unmodifiableList(new ArrayList<>(builder.mTimeModels));

        } else {
@@ -120,9 +125,9 @@ public final class GalileoAssistance implements Parcelable { 
        return mLeapSecondsModel;

    }



    /** Returns the auxiliary information. */

    @Nullable

    public AuxiliaryInformation getAuxiliaryInformation() {

    /** Returns the list of auxiliary informations. */

    @NonNull

    public List<AuxiliaryInformation> getAuxiliaryInformation() {

        return mAuxiliaryInformation;

    }
@@ -161,7 +166,7 @@ public final class GalileoAssistance implements Parcelable { 
        dest.writeTypedObject(mIonosphericModel, flags);

        dest.writeTypedObject(mUtcModel, flags);

        dest.writeTypedObject(mLeapSecondsModel, flags);

        dest.writeTypedObject(mAuxiliaryInformation, flags);

        dest.writeTypedList(mAuxiliaryInformation);

        dest.writeTypedList(mTimeModels);

        dest.writeTypedList(mSatelliteEphemeris);

        dest.writeTypedList(mRealTimeIntegrityModels);
@@ -196,7 +201,7 @@ public final class GalileoAssistance implements Parcelable { 
                            .setUtcModel(in.readTypedObject(UtcModel.CREATOR))

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

                            .setAuxiliaryInformation(

                                    in.readTypedObject(AuxiliaryInformation.CREATOR))

                                    in.createTypedArrayList(AuxiliaryInformation.CREATOR))

                            .setTimeModels(in.createTypedArrayList(TimeModel.CREATOR))

                            .setSatelliteEphemeris(

                                    in.createTypedArrayList(GalileoSatelliteEphemeris.CREATOR))
@@ -219,7 +224,7 @@ public final class GalileoAssistance implements Parcelable { 
        private GalileoIonosphericModel mIonosphericModel;

        private UtcModel mUtcModel;

        private LeapSecondsModel mLeapSecondsModel;

        private AuxiliaryInformation mAuxiliaryInformation;

        private List<AuxiliaryInformation> mAuxiliaryInformation;

        private List<TimeModel> mTimeModels;

        private List<GalileoSatelliteEphemeris> mSatelliteEphemeris;

        private List<RealTimeIntegrityModel> mRealTimeIntegrityModels;
@@ -253,10 +258,10 @@ public final class GalileoAssistance implements Parcelable { 
            return this;

        }



        /** Sets the auxiliary information. */

        /** Sets the list of auxiliary informations. */

        @NonNull

        public Builder setAuxiliaryInformation(

                @Nullable AuxiliaryInformation auxiliaryInformation) {

                @NonNull List<AuxiliaryInformation> auxiliaryInformation) {

            mAuxiliaryInformation = auxiliaryInformation;

            return this;

        }

location/java/android/location/GlonassAssistance.java

+44 −11
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ public final class GlonassAssistance implements Parcelable { 
    /** The UTC model. */

    @Nullable private final UtcModel mUtcModel;



    /** The auxiliary information. */

    @Nullable private final AuxiliaryInformation mAuxiliaryInformation;

    /** The list of auxiliary informations. */

    @NonNull private final List<AuxiliaryInformation> mAuxiliaryInformation;



    /** The list of time models. */

    @NonNull private final List<TimeModel> mTimeModels;
@@ -56,10 +56,18 @@ public final class GlonassAssistance implements Parcelable { 
    /** The list of Glonass satellite corrections. */

    @NonNull private final List<GnssSatelliteCorrections> mSatelliteCorrections;



    /** The list of real time integrity models. */

    @NonNull private final List<RealTimeIntegrityModel> mRealTimeIntegrityModels;



    private GlonassAssistance(Builder builder) {

        mAlmanac = builder.mAlmanac;

        mUtcModel = builder.mUtcModel;

        mAuxiliaryInformation = builder.mAuxiliaryInformation;

        if (builder.mAuxiliaryInformation != null) {

            mAuxiliaryInformation =

                    Collections.unmodifiableList(new ArrayList<>(builder.mAuxiliaryInformation));

        } else {

            mAuxiliaryInformation = new ArrayList<>();

        }

        if (builder.mTimeModels != null) {

            mTimeModels = Collections.unmodifiableList(new ArrayList<>(builder.mTimeModels));

        } else {
@@ -77,6 +85,12 @@ public final class GlonassAssistance implements Parcelable { 
        } else {

            mSatelliteCorrections = new ArrayList<>();

        }

        if (builder.mRealTimeIntegrityModels != null) {

            mRealTimeIntegrityModels =

                    Collections.unmodifiableList(new ArrayList<>(builder.mRealTimeIntegrityModels));

        } else {

            mRealTimeIntegrityModels = new ArrayList<>();

        }

    }



    /** Returns the Glonass almanac. */
@@ -109,9 +123,15 @@ public final class GlonassAssistance implements Parcelable { 
        return mSatelliteCorrections;

    }



    /** Returns the auxiliary information. */

    @Nullable

    public AuxiliaryInformation getAuxiliaryInformation() {

    /** Returns the list of real time integrity models. */

    @NonNull

    public List<RealTimeIntegrityModel> getRealTimeIntegrityModels() {

        return mRealTimeIntegrityModels;

    }



    /** Returns the list of auxiliary informations. */

    @NonNull

    public List<AuxiliaryInformation> getAuxiliaryInformation() {

        return mAuxiliaryInformation;

    }
@@ -124,10 +144,11 @@ public final class GlonassAssistance implements Parcelable { 
    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeTypedObject(mAlmanac, flags);

        dest.writeTypedObject(mUtcModel, flags);

        dest.writeTypedObject(mAuxiliaryInformation, flags);

        dest.writeTypedList(mAuxiliaryInformation);

        dest.writeTypedList(mTimeModels);

        dest.writeTypedList(mSatelliteEphemeris);

        dest.writeTypedList(mSatelliteCorrections);

        dest.writeTypedList(mRealTimeIntegrityModels);

    }



    @Override
@@ -140,6 +161,7 @@ public final class GlonassAssistance implements Parcelable { 
        builder.append(", timeModels = ").append(mTimeModels);

        builder.append(", satelliteEphemeris = ").append(mSatelliteEphemeris);

        builder.append(", satelliteCorrections = ").append(mSatelliteCorrections);

        builder.append(", realTimeIntegrityModels = ").append(mRealTimeIntegrityModels);

        builder.append("]");

        return builder.toString();

    }
@@ -152,12 +174,14 @@ public final class GlonassAssistance implements Parcelable { 
                            .setAlmanac(in.readTypedObject(GlonassAlmanac.CREATOR))

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

                            .setAuxiliaryInformation(

                                    in.readTypedObject(AuxiliaryInformation.CREATOR))

                                    in.createTypedArrayList(AuxiliaryInformation.CREATOR))

                            .setTimeModels(in.createTypedArrayList(TimeModel.CREATOR))

                            .setSatelliteEphemeris(

                                    in.createTypedArrayList(GlonassSatelliteEphemeris.CREATOR))

                            .setSatelliteCorrections(

                                    in.createTypedArrayList(GnssSatelliteCorrections.CREATOR))

                            .setRealTimeIntegrityModels(

                                    in.createTypedArrayList(RealTimeIntegrityModel.CREATOR))

                            .build();

                }
@@ -171,10 +195,11 @@ public final class GlonassAssistance implements Parcelable { 
    public static final class Builder {

        private GlonassAlmanac mAlmanac;

        private UtcModel mUtcModel;

        private AuxiliaryInformation mAuxiliaryInformation;

        private List<AuxiliaryInformation> mAuxiliaryInformation;

        private List<TimeModel> mTimeModels;

        private List<GlonassSatelliteEphemeris> mSatelliteEphemeris;

        private List<GnssSatelliteCorrections> mSatelliteCorrections;

        private List<RealTimeIntegrityModel> mRealTimeIntegrityModels;



        /** Sets the Glonass almanac. */

        @NonNull
@@ -190,10 +215,10 @@ public final class GlonassAssistance implements Parcelable { 
            return this;

        }



        /** Sets the auxiliary information. */

        /** Sets the list of auxiliary informations. */

        @NonNull

        public Builder setAuxiliaryInformation(

                @Nullable AuxiliaryInformation auxiliaryInformation) {

                @NonNull List<AuxiliaryInformation> auxiliaryInformation) {

            mAuxiliaryInformation = auxiliaryInformation;

            return this;

        }
@@ -221,6 +246,14 @@ public final class GlonassAssistance implements Parcelable { 
            return this;

        }



        /** Sets the list of real time integrity models. */

        @NonNull

        public Builder setRealTimeIntegrityModels(

                @NonNull List<RealTimeIntegrityModel> realTimeIntegrityModels) {

            mRealTimeIntegrityModels = realTimeIntegrityModels;

            return this;

        }



        /** Builds the {@link GlonassAssistance}. */

        @NonNull

        public GlonassAssistance build() {

location/java/android/location/GpsAssistance.java

+16 −11
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public final class GpsAssistance implements Parcelable { 
    /** The leap seconds model. */

    @Nullable private final LeapSecondsModel mLeapSecondsModel;



    /** The auxiliary information. */

    @Nullable private final AuxiliaryInformation mAuxiliaryInformation;

    /** The list of auxiliary informations. */

    @NonNull private final List<AuxiliaryInformation> mAuxiliaryInformation;



    /** The list of time models. */

    @NonNull private final List<TimeModel> mTimeModels;
@@ -71,7 +71,12 @@ public final class GpsAssistance implements Parcelable { 
        mIonosphericModel = builder.mIonosphericModel;

        mUtcModel = builder.mUtcModel;

        mLeapSecondsModel = builder.mLeapSecondsModel;

        mAuxiliaryInformation = builder.mAuxiliaryInformation;

        if (builder.mAuxiliaryInformation != null) {

            mAuxiliaryInformation =

                    Collections.unmodifiableList(new ArrayList<>(builder.mAuxiliaryInformation));

        } else {

            mAuxiliaryInformation = new ArrayList<>();

        }

        if (builder.mTimeModels != null) {

            mTimeModels = Collections.unmodifiableList(new ArrayList<>(builder.mTimeModels));

        } else {
@@ -121,9 +126,9 @@ public final class GpsAssistance implements Parcelable { 
        return mLeapSecondsModel;

    }



    /** Returns the auxiliary information. */

    @Nullable

    public AuxiliaryInformation getAuxiliaryInformation() {

    /** Returns the list of auxiliary informations. */

    @NonNull

    public List<AuxiliaryInformation> getAuxiliaryInformation() {

        return mAuxiliaryInformation;

    }
@@ -163,7 +168,7 @@ public final class GpsAssistance implements Parcelable { 
                            .setUtcModel(in.readTypedObject(UtcModel.CREATOR))

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

                            .setAuxiliaryInformation(

                                    in.readTypedObject(AuxiliaryInformation.CREATOR))

                                    in.createTypedArrayList(AuxiliaryInformation.CREATOR))

                            .setTimeModels(in.createTypedArrayList(TimeModel.CREATOR))

                            .setSatelliteEphemeris(

                                    in.createTypedArrayList(GpsSatelliteEphemeris.CREATOR))
@@ -191,7 +196,7 @@ public final class GpsAssistance implements Parcelable { 
        dest.writeTypedObject(mIonosphericModel, flags);

        dest.writeTypedObject(mUtcModel, flags);

        dest.writeTypedObject(mLeapSecondsModel, flags);

        dest.writeTypedObject(mAuxiliaryInformation, flags);

        dest.writeTypedList(mAuxiliaryInformation);

        dest.writeTypedList(mTimeModels);

        dest.writeTypedList(mSatelliteEphemeris);

        dest.writeTypedList(mRealTimeIntegrityModels);
@@ -221,7 +226,7 @@ public final class GpsAssistance implements Parcelable { 
        private KlobucharIonosphericModel mIonosphericModel;

        private UtcModel mUtcModel;

        private LeapSecondsModel mLeapSecondsModel;

        private AuxiliaryInformation mAuxiliaryInformation;

        private List<AuxiliaryInformation> mAuxiliaryInformation;

        private List<TimeModel> mTimeModels;

        private List<GpsSatelliteEphemeris> mSatelliteEphemeris;

        private List<RealTimeIntegrityModel> mRealTimeIntegrityModels;
@@ -256,10 +261,10 @@ public final class GpsAssistance implements Parcelable { 
            return this;

        }



        /** Sets the auxiliary information. */

        /** Sets the list of auxiliary informations. */

        @NonNull

        public Builder setAuxiliaryInformation(

                @Nullable AuxiliaryInformation auxiliaryInformation) {

                @NonNull List<AuxiliaryInformation> auxiliaryInformation) {

            mAuxiliaryInformation = auxiliaryInformation;

            return this;

        }