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

Commit c0b231c9 authored by Shinru Han's avatar Shinru Han
Browse files

Update GnssAssistance AIDL 

- Add missing fields for Glonass ephemeris & almanac.
- Define health type for Galileo & Glonass.

Bug: 358381377
Test: atest VtsHalGnssTargetTest
Change-Id: Icb9c895e95b6cb25c21a63a8026017227c0c5cc3
parent 42f3ec65

gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/gnss_assistance/BeidouSatelliteEphemeris.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package android.hardware.gnss.gnss_assistance; 
/* @hide */

@VintfStability

parcelable BeidouSatelliteEphemeris {

  int prn;

  int svid;

  android.hardware.gnss.gnss_assistance.BeidouSatelliteEphemeris.BeidouSatelliteClockModel satelliteClockModel;

  android.hardware.gnss.gnss_assistance.KeplerianOrbitModel satelliteOrbitModel;

  android.hardware.gnss.gnss_assistance.BeidouSatelliteEphemeris.BeidouSatelliteHealth satelliteHealth;

gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/gnss_assistance/GalileoSatelliteEphemeris.aidl

+19 −7
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.gnss.gnss_assistance; 
/* @hide */

@VintfStability

parcelable GalileoSatelliteEphemeris {

  int satelliteCodeNumber;

  int svid;

  android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSatelliteClockModel[] satelliteClockModel;

  android.hardware.gnss.gnss_assistance.KeplerianOrbitModel satelliteOrbitModel;

  android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth svHealth;
@@ -58,11 +58,23 @@ parcelable GalileoSatelliteEphemeris { 
  }

  @VintfStability

  parcelable GalileoSvHealth {

    int dataValidityStatusE1b;

    int signalHealthStatusE1b;

    int dataValidityStatusE5a;

    int signalHealthStatusE5a;

    int dataValidityStatusE5b;

    int signalHealthStatusE5b;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthDataVaidityType dataValidityStatusE1b;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthStatusType signalHealthStatusE1b;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthDataVaidityType dataValidityStatusE5a;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthStatusType signalHealthStatusE5a;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthDataVaidityType dataValidityStatusE5b;

    android.hardware.gnss.gnss_assistance.GalileoSatelliteEphemeris.GalileoSvHealth.GalileoHealthStatusType signalHealthStatusE5b;

    @Backing(type="int") @VintfStability

    enum GalileoHealthDataVaidityType {

      DATA_VALID = 0,

      WORKING_WITHOUT_GUARANTEE = 1,

    }

    @Backing(type="int") @VintfStability

    enum GalileoHealthStatusType {

      OK = 0,

      OUT_OF_SERVICE = 1,

      EXTENDED_OPERATION_MODE = 2,

      IN_TEST = 3,

    }

  }

}

gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/gnss_assistance/GlonassAlmanac.aidl

+4 −2
Original line number Diff line number Diff line
@@ -21,12 +21,14 @@ package android.hardware.gnss.gnss_assistance; 
@VintfStability

parcelable GlonassAlmanac {

  long issueDateMs;

  android.hardware.gnss.gnss_assistance.GlonassAlmanac.GlonassSatelliteAlmanac[] satelliteAlmanac;

  android.hardware.gnss.gnss_assistance.GlonassAlmanac.GlonassSatelliteAlmanac[] satelliteAlmanacs;

  @VintfStability

  parcelable GlonassSatelliteAlmanac {

    int slotNumber;

    int svHealth;

    int frequencyChannel;

    int frequencyChannelNumber;

    int calendarDayNumber;

    boolean isGlonassM;

    double tau;

    double tLambda;

    double lambda;

gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/gnss_assistance/GlonassSatelliteEphemeris.aidl

+8 −2
Original line number Diff line number Diff line
@@ -39,14 +39,20 @@ parcelable GlonassSatelliteEphemeris { 
  int svHealth;

  double frameTimeSeconds;

  int ageInDays;

  int updateIntervalMinutes;

  boolean isOddUpdateInterval;

  boolean isGlonassM;

  android.hardware.gnss.gnss_assistance.GlonassSatelliteEphemeris.GlonassSatelliteClockModel satelliteClockModel;

  android.hardware.gnss.gnss_assistance.GlonassSatelliteEphemeris.GlonassSatelliteOrbitModel satelliteOrbitModel;

  const int GLONASS_HEALTH_STATUS_HEALTHY = 0;

  const int GLONASS_HEALTH_STATUS_UNHEALTHY = 1;

  @VintfStability

  parcelable GlonassSatelliteClockModel {

    long timeOfClockSeconds;

    double clockBias;

    double freqBias;

    int freqNumber;

    double frequencyBias;

    int frequencyChannelNumber;

    double groupDelayDiffSeconds;

  }

  @VintfStability

  parcelable GlonassSatelliteOrbitModel {

gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/gnss_assistance/GnssAlmanac.aidl

+3 −2
Original line number Diff line number Diff line
@@ -36,10 +36,11 @@ package android.hardware.gnss.gnss_assistance; 
@VintfStability

parcelable GnssAlmanac {

  long issueDateMs;

  int iod;

  int ioda;

  int weekNumber;

  int toaSeconds;

  android.hardware.gnss.gnss_assistance.GnssAlmanac.GnssSatelliteAlmanac[] satelliteAlmanac;

  boolean isCompleteAlmanacProvided;

  android.hardware.gnss.gnss_assistance.GnssAlmanac.GnssSatelliteAlmanac[] satelliteAlmanacs;

  @VintfStability

  parcelable GnssSatelliteAlmanac {

    int svid;