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

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

Update GnssAssistance AIDL to match framework changes. 

- Merge BeidouAlmanac, GalileoAlmanac, GpsAlmanac, QzssAlmanac into
  GnssAlmanac.
- Change the unit of some fields in KeplerianOrbitModel from
  semi-circles to radians.
- Add a comment to clarify that the week number in
  SatelliteEphemerisTime is without rollover.

Bug: 358381377
Test: atest VtsHalGnssTargetTest

Change-Id: I4f712632d39c5e77865662e28bc929669c4e25e9
parent d9535a1e

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.gnss.gnss_assistance;

/* @hide */

@VintfStability

parcelable BeidouAlmanac {

  int beidouWeekNumber;

  android.hardware.gnss.gnss_assistance.BeidouAlmanac.BeidouSatelliteAlmanac[] satelliteAlmanac;

  @VintfStability

  parcelable BeidouSatelliteAlmanac {

    int prn;

    int svHealth;

    int toaSeconds;

    double eccentricity;

    double deltaI;

    double omega;

    double omega0;

    double omegaDot;

    double rootA;

    double m0;

    double af0;

    double af1;

  }

}

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

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.gnss.gnss_assistance;

/* @hide */

@VintfStability

parcelable GalileoAlmanac {

  long issueDate;

  int weekNumber;

  int toa;

  int iod;

  android.hardware.gnss.gnss_assistance.GalileoAlmanac.GalileoSatelliteAlmanac[] satelliteAlmanac;

  @VintfStability

  parcelable GalileoSatelliteAlmanac {

    int svId;

    android.hardware.gnss.gnss_assistance.GalileoAlmanac.GalileoAlmanacSvHealth svHealth;

    double eccentricity;

    double deltaI;

    double omega;

    double omega0;

    double omegaDot;

    double rootA;

    double m0;

    double af0;

    double af1;

    int weekNumber;

    int toa;

    int iod;

  }

  @VintfStability

  parcelable GalileoAlmanacSvHealth {

    int fNavE5a;

    int iNavE5b;

    int iNavE1b;

  }

}

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

+8 −6
Original line number Diff line number Diff line
@@ -34,13 +34,15 @@ 
package android.hardware.gnss.gnss_assistance;

/* @hide */

@VintfStability

parcelable QzssAlmanac {

  int qzssWeekNumber;

  int secondsOfQzssWeek;

  android.hardware.gnss.gnss_assistance.QzssAlmanac.QzssSatelliteAlmanac[] satelliteAlmanac;

parcelable GnssAlmanac {

  long issueDateMs;

  int iod;

  int weekNumber;

  int toaSeconds;

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

  @VintfStability

  parcelable QzssSatelliteAlmanac {

    int prn;

  parcelable GnssSatelliteAlmanac {

    int svid;

    int svHealth;

    double eccentricity;

    double inclination;

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

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

parcelable GnssAssistance {

  android.hardware.gnss.gnss_assistance.GnssAssistance.GpsAssistance gpsAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.GlonassAssistance gloAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.GalileoAssistance galAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.BeidouAssistance bdsAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.QzssAssistance qzsAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.GlonassAssistance glonassAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.GalileoAssistance galileoAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.BeidouAssistance beidouAssistance;

  android.hardware.gnss.gnss_assistance.GnssAssistance.QzssAssistance qzssAssistance;

  @VintfStability

  parcelable GnssSatelliteCorrections {

    int svid;
@@ -47,7 +47,7 @@ parcelable GnssAssistance { 
  }

  @VintfStability

  parcelable GpsAssistance {

    android.hardware.gnss.gnss_assistance.GpsAlmanac almanac;

    android.hardware.gnss.gnss_assistance.GnssAlmanac almanac;

    android.hardware.gnss.gnss_assistance.KlobucharIonosphericModel ionosphericModel;

    android.hardware.gnss.gnss_assistance.UtcModel utcModel;

    android.hardware.gnss.gnss_assistance.LeapSecondsModel leapSecondsModel;
@@ -58,7 +58,7 @@ parcelable GnssAssistance { 
  }

  @VintfStability

  parcelable GalileoAssistance {

    android.hardware.gnss.gnss_assistance.GalileoAlmanac almanac;

    android.hardware.gnss.gnss_assistance.GnssAlmanac almanac;

    android.hardware.gnss.gnss_assistance.GalileoIonosphericModel ionosphericModel;

    android.hardware.gnss.gnss_assistance.UtcModel utcModel;

    android.hardware.gnss.gnss_assistance.LeapSecondsModel leapSecondsModel;
@@ -77,7 +77,7 @@ parcelable GnssAssistance { 
  }

  @VintfStability

  parcelable QzssAssistance {

    android.hardware.gnss.gnss_assistance.QzssAlmanac almanac;

    android.hardware.gnss.gnss_assistance.GnssAlmanac almanac;

    android.hardware.gnss.gnss_assistance.KlobucharIonosphericModel ionosphericModel;

    android.hardware.gnss.gnss_assistance.UtcModel utcModel;

    android.hardware.gnss.gnss_assistance.LeapSecondsModel leapSecondsModel;
@@ -88,7 +88,7 @@ parcelable GnssAssistance { 
  }

  @VintfStability

  parcelable BeidouAssistance {

    android.hardware.gnss.gnss_assistance.BeidouAlmanac almanac;

    android.hardware.gnss.gnss_assistance.GnssAlmanac almanac;

    android.hardware.gnss.gnss_assistance.KlobucharIonosphericModel ionosphericModel;

    android.hardware.gnss.gnss_assistance.UtcModel utcModel;

    android.hardware.gnss.gnss_assistance.LeapSecondsModel leapSecondsModel;

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.gnss.gnss_assistance;

/* @hide */

@VintfStability

parcelable GpsAlmanac {

  int gpsWeekNumber;

  int secondsOfGpsWeek;

  android.hardware.gnss.gnss_assistance.GpsAlmanac.GpsSatelliteAlmanac[] satelliteAlmanac;

  @VintfStability

  parcelable GpsSatelliteAlmanac {

    int prn;

    int svHealth;

    double eccentricity;

    double inclination;

    double omega;

    double omega0;

    double omegaDot;

    double rootA;

    double m0;

    double af0;

    double af1;

  }

}