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

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

Merge "Add AuxiliaryInformation to GnssAssistance" into main

parents e6852e64 98b4a9ce

location/api/system-current.txt

+56 −23
Original line number Diff line number Diff line 
// Signature format: 2.0

package android.location {



  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class AuxiliaryInformation implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public java.util.List<android.location.GnssSignalType> getAvailableSignalTypes();

    method @IntRange(from=0xfffffff9, to=6) public int getFrequencyChannelNumber();

    method public int getSatType();

    method @IntRange(from=1) public int getSvid();

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

    field public static final int BDS_B1C_ORBIT_TYPE_GEO = 1; // 0x1

    field public static final int BDS_B1C_ORBIT_TYPE_IGSO = 2; // 0x2

    field public static final int BDS_B1C_ORBIT_TYPE_MEO = 3; // 0x3

    field public static final int BDS_B1C_ORBIT_TYPE_UNDEFINED = 0; // 0x0

    field @NonNull public static final android.os.Parcelable.Creator<android.location.AuxiliaryInformation> CREATOR;

  }



  public static final class AuxiliaryInformation.Builder {

    ctor public AuxiliaryInformation.Builder();

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

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

    method @NonNull public android.location.AuxiliaryInformation.Builder setFrequencyChannelNumber(@IntRange(from=0xfffffff9, to=6) int);

    method @NonNull public android.location.AuxiliaryInformation.Builder setSatType(int);

    method @NonNull public android.location.AuxiliaryInformation.Builder setSvid(@IntRange(from=1) int);

  }



  public abstract class BatchedLocationCallback {

    ctor public BatchedLocationCallback();

    method public void onLocationBatch(java.util.List<android.location.Location>);
@@ -9,6 +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 @Nullable public android.location.KlobucharIonosphericModel getIonosphericModel();

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -24,12 +48,13 @@ 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 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(@Nullable java.util.List<android.location.RealTimeIntegrityModel>);

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

    method @NonNull public android.location.BeidouAssistance.Builder setSatelliteEphemeris(@Nullable java.util.List<android.location.BeidouSatelliteEphemeris>);

    method @NonNull public android.location.BeidouAssistance.Builder setTimeModels(@Nullable java.util.List<android.location.TimeModel>);

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

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

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

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

    method @NonNull public android.location.BeidouAssistance.Builder setUtcModel(@Nullable android.location.UtcModel);

  }
@@ -151,6 +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 @Nullable public android.location.KlobucharIonosphericModel getIonosphericModel();

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -166,12 +192,13 @@ 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 setIonosphericModel(@Nullable android.location.KlobucharIonosphericModel);

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

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

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

    method @NonNull public android.location.GalileoAssistance.Builder setSatelliteEphemeris(@Nullable java.util.List<android.location.GalileoSatelliteEphemeris>);

    method @NonNull public android.location.GalileoAssistance.Builder setTimeModels(@Nullable java.util.List<android.location.TimeModel>);

    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>);

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

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

    method @NonNull public android.location.GalileoAssistance.Builder setUtcModel(@Nullable android.location.UtcModel);

  }
@@ -319,6 +346,7 @@ 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.GnssAssistance.GnssSatelliteCorrections> getSatelliteCorrections();

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

    method @NonNull public java.util.List<android.location.TimeModel> getTimeModels();
@@ -331,9 +359,10 @@ 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 setSatelliteCorrections(@Nullable java.util.List<android.location.GnssAssistance.GnssSatelliteCorrections>);

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

    method @NonNull public android.location.GlonassAssistance.Builder setTimeModels(@Nullable java.util.List<android.location.TimeModel>);

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

    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>);

    method @NonNull public android.location.GlonassAssistance.Builder setUtcModel(@Nullable android.location.UtcModel);

  }
@@ -688,6 +717,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 @Nullable public android.location.KlobucharIonosphericModel getIonosphericModel();

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -703,12 +733,13 @@ 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 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(@Nullable java.util.List<android.location.RealTimeIntegrityModel>);

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

    method @NonNull public android.location.GpsAssistance.Builder setSatelliteEphemeris(@Nullable java.util.List<android.location.GpsSatelliteEphemeris>);

    method @NonNull public android.location.GpsAssistance.Builder setTimeModels(@Nullable java.util.List<android.location.TimeModel>);

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

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

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

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

    method @NonNull public android.location.GpsAssistance.Builder setUtcModel(@Nullable android.location.UtcModel);

  }
@@ -1222,6 +1253,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 @Nullable public android.location.KlobucharIonosphericModel getIonosphericModel();

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

    method @NonNull public java.util.List<android.location.RealTimeIntegrityModel> getRealTimeIntegrityModels();
@@ -1237,12 +1269,13 @@ 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 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(@Nullable java.util.List<android.location.RealTimeIntegrityModel>);

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

    method @NonNull public android.location.QzssAssistance.Builder setSatelliteEphemeris(@Nullable java.util.List<android.location.QzssSatelliteEphemeris>);

    method @NonNull public android.location.QzssAssistance.Builder setTimeModels(@Nullable java.util.List<android.location.TimeModel>);

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

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

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

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

    method @NonNull public android.location.QzssAssistance.Builder setUtcModel(@Nullable android.location.UtcModel);

  }
@@ -1273,11 +1306,11 @@ package android.location { 
    method public int describeContents();

    method @NonNull public String getAdvisoryNumber();

    method @NonNull public String getAdvisoryType();

    method @NonNull public java.util.List<android.location.GnssSignalType> getBadSignalTypes();

    method @IntRange(from=1, to=206) public int getBadSvid();

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

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

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

    method @IntRange(from=1, to=206) public int getSvid();

    method public boolean isUsable();

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

    field @NonNull public static final android.os.Parcelable.Creator<android.location.RealTimeIntegrityModel> CREATOR;

  }
@@ -1287,11 +1320,11 @@ package android.location { 
    method @NonNull public android.location.RealTimeIntegrityModel build();

    method @NonNull public android.location.RealTimeIntegrityModel.Builder setAdvisoryNumber(@NonNull String);

    method @NonNull public android.location.RealTimeIntegrityModel.Builder setAdvisoryType(@NonNull String);

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

    method @NonNull public android.location.RealTimeIntegrityModel.Builder setBadSvid(@IntRange(from=1, to=206) int);

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

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

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

    method @NonNull public android.location.RealTimeIntegrityModel.Builder setSvid(@IntRange(from=1, to=206) int);

    method @NonNull public android.location.RealTimeIntegrityModel.Builder setUsable(boolean);

  }



  @FlaggedApi("android.location.flags.gnss_assistance_interface") public final class SatelliteEphemerisTime implements android.os.Parcelable {

location/java/android/location/AuxiliaryInformation.java

0 → 100644
+274 −0

File added.

Preview size limit exceeded, changes collapsed.

location/java/android/location/BeidouAssistance.java

+27 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.location; 
import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.location.GnssAssistance.GnssSatelliteCorrections;

import android.location.flags.Flags;
@@ -51,6 +50,9 @@ 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 time models. */

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

        mUtcModel = builder.mUtcModel;

        mLeapSecondsModel = builder.mLeapSecondsModel;

        mAuxiliaryInformation = builder.mAuxiliaryInformation;

        if (builder.mTimeModels != null) {

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

        } else {
@@ -117,6 +120,12 @@ public final class BeidouAssistance implements Parcelable { 
        return mLeapSecondsModel;

    }



    /** Returns the auxiliary information. */

    @Nullable

    public AuxiliaryInformation getAuxiliaryInformation() {

        return mAuxiliaryInformation;

    }



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

    @NonNull

    public List<TimeModel> getTimeModels() {
@@ -154,6 +163,7 @@ public final class BeidouAssistance implements Parcelable { 
        builder.append(", ionosphericModel = ").append(mIonosphericModel);

        builder.append(", utcModel = ").append(mUtcModel);

        builder.append(", leapSecondsModel = ").append(mLeapSecondsModel);

        builder.append(", auxiliaryInformation = ").append(mAuxiliaryInformation);

        builder.append(", timeModels = ").append(mTimeModels);

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

        builder.append(", realTimeIntegrityModels = ").append(mRealTimeIntegrityModels);
@@ -168,6 +178,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(mTimeModels);

        dest.writeTypedList(mSatelliteEphemeris);

        dest.writeTypedList(mRealTimeIntegrityModels);
@@ -184,6 +195,8 @@ public final class BeidouAssistance implements Parcelable { 
                                    in.readTypedObject(KlobucharIonosphericModel.CREATOR))

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

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

                            .setAuxiliaryInformation(

                                    in.readTypedObject(AuxiliaryInformation.CREATOR))

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

                            .setSatelliteEphemeris(

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

        private UtcModel mUtcModel;

        private LeapSecondsModel mLeapSecondsModel;

        private AuxiliaryInformation mAuxiliaryInformation;

        private List<TimeModel> mTimeModels;

        private List<BeidouSatelliteEphemeris> mSatelliteEphemeris;

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

        }



        /** Sets the auxiliary information. */

        @NonNull

        public Builder setAuxiliaryInformation(

                @Nullable AuxiliaryInformation auxiliaryInformation) {

            mAuxiliaryInformation = auxiliaryInformation;

            return this;

        }



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

        @NonNull

        public Builder setTimeModels(

                @Nullable @SuppressLint("NullableCollection") List<TimeModel> timeModels) {

        public Builder setTimeModels(@NonNull List<TimeModel> timeModels) {

            mTimeModels = timeModels;

            return this;

        }
@@ -250,8 +271,7 @@ public final class BeidouAssistance implements Parcelable { 
        /** Sets the list of Beidou ephemeris. */

        @NonNull

        public Builder setSatelliteEphemeris(

                @Nullable @SuppressLint("NullableCollection")

                        List<BeidouSatelliteEphemeris> satelliteEphemeris) {

                @NonNull List<BeidouSatelliteEphemeris> satelliteEphemeris) {

            mSatelliteEphemeris = satelliteEphemeris;

            return this;

        }
@@ -259,8 +279,7 @@ public final class BeidouAssistance implements Parcelable { 
        /** Sets the list of real time integrity models. */

        @NonNull

        public Builder setRealTimeIntegrityModels(

                @Nullable @SuppressLint("NullableCollection")

                        List<RealTimeIntegrityModel> realTimeIntegrityModels) {

                @NonNull List<RealTimeIntegrityModel> realTimeIntegrityModels) {

            mRealTimeIntegrityModels = realTimeIntegrityModels;

            return this;

        }
@@ -268,8 +287,7 @@ public final class BeidouAssistance implements Parcelable { 
        /** Sets the list of Beidou satellite corrections. */

        @NonNull

        public Builder setSatelliteCorrections(

                @Nullable @SuppressLint("NullableCollection")

                        List<GnssSatelliteCorrections> satelliteCorrections) {

                @NonNull List<GnssSatelliteCorrections> satelliteCorrections) {

            mSatelliteCorrections = satelliteCorrections;

            return this;

        }

location/java/android/location/GalileoAssistance.java

+27 −9

File changed.

Preview size limit exceeded, changes collapsed.

location/java/android/location/GlonassAssistance.java

+28 −11

File changed.

Preview size limit exceeded, changes collapsed.