diff options
Diffstat (limited to 'gnss/common/utils/default/include/Utils.h')
| -rw-r--r-- | gnss/common/utils/default/include/Utils.h | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/gnss/common/utils/default/include/Utils.h b/gnss/common/utils/default/include/Utils.h index d9ad5a5a66..43772ce11a 100644 --- a/gnss/common/utils/default/include/Utils.h +++ b/gnss/common/utils/default/include/Utils.h @@ -17,6 +17,7 @@ #ifndef android_hardware_gnss_common_default_Utils_H_ #define android_hardware_gnss_common_default_Utils_H_ +#include <aidl/android/hardware/gnss/BnGnssMeasurementInterface.h> #include <android/hardware/gnss/1.0/IGnss.h> #include <android/hardware/gnss/2.0/IGnss.h> #include <android/hardware/gnss/2.1/IGnss.h> @@ -28,28 +29,24 @@ namespace hardware { namespace gnss { namespace common { -using GnssDataV2_0 = V2_0::IGnssMeasurementCallback::GnssData; -using GnssDataV2_1 = V2_1::IGnssMeasurementCallback::GnssData; -using GnssSvInfoV1_0 = V1_0::IGnssCallback::GnssSvInfo; -using GnssSvInfoV2_0 = V2_0::IGnssCallback::GnssSvInfo; -using GnssSvInfoV2_1 = V2_1::IGnssCallback::GnssSvInfo; -using GnssAntennaInfo = ::android::hardware::gnss::V2_1::IGnssAntennaInfoCallback::GnssAntennaInfo; -using Row = ::android::hardware::gnss::V2_1::IGnssAntennaInfoCallback::Row; -using Coord = ::android::hardware::gnss::V2_1::IGnssAntennaInfoCallback::Coord; - struct Utils { - static GnssDataV2_0 getMockMeasurementV2_0(); - static GnssDataV2_1 getMockMeasurementV2_1(); + static aidl::android::hardware::gnss::GnssData getMockMeasurement( + const bool enableCorrVecOutputs); + static V2_0::IGnssMeasurementCallback::GnssData getMockMeasurementV2_0(); + static V2_1::IGnssMeasurementCallback::GnssData getMockMeasurementV2_1(); static V2_0::GnssLocation getMockLocationV2_0(); static V1_0::GnssLocation getMockLocationV1_0(); - static hidl_vec<GnssSvInfoV2_1> getMockSvInfoListV2_1(); - static GnssSvInfoV2_1 getMockSvInfoV2_1(GnssSvInfoV2_0 gnssSvInfoV2_0, float basebandCN0DbHz); - static GnssSvInfoV2_0 getMockSvInfoV2_0(GnssSvInfoV1_0 gnssSvInfoV1_0, - V2_0::GnssConstellationType type); - static GnssSvInfoV1_0 getMockSvInfoV1_0(int16_t svid, V1_0::GnssConstellationType type, - float cN0DbHz, float elevationDegrees, - float azimuthDegrees); - static hidl_vec<GnssAntennaInfo> getMockAntennaInfos(); + static hidl_vec<V2_1::IGnssCallback::GnssSvInfo> getMockSvInfoListV2_1(); + static V2_1::IGnssCallback::GnssSvInfo getMockSvInfoV2_1( + V2_0::IGnssCallback::GnssSvInfo gnssSvInfoV2_0, float basebandCN0DbHz); + static V2_0::IGnssCallback::GnssSvInfo getMockSvInfoV2_0( + V1_0::IGnssCallback::GnssSvInfo gnssSvInfoV1_0, V2_0::GnssConstellationType type); + static V1_0::IGnssCallback::GnssSvInfo getMockSvInfoV1_0(int16_t svid, + V1_0::GnssConstellationType type, + float cN0DbHz, float elevationDegrees, + float azimuthDegrees, + float carrierFrequencyHz); + static hidl_vec<V2_1::IGnssAntennaInfoCallback::GnssAntennaInfo> getMockAntennaInfos(); }; } // namespace common |