Change CodeType from enum to string (HAL)
Bug: 127464982
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: Ia8635c3c071bcb03b75d17ac1ba36767dc7eda72
diff --git a/current.txt b/current.txt
index 4ad47e1..a1c5fec 100644
--- a/current.txt
+++ b/current.txt
@@ -467,7 +467,7 @@
d815623a6d1ba4abf21248b84eca70a2bfab03058a88b68a29c063ce8aee6b5c android.hardware.gnss@2.0::IGnssCallback
ecc966c68bddbd95c8dae782b84204cf01c75734675e8769963f3b5106ec128b android.hardware.gnss@2.0::IGnssConfiguration
c67759f5d6387d273b66729180d03690e827f0b6b8d4e13ce2ff42d31b224065 android.hardware.gnss@2.0::IGnssMeasurement
-089338944c45f66f25ba4ee958c161c42fefeb73ec60e4451f3535a1b3fd10c7 android.hardware.gnss@2.0::IGnssMeasurementCallback
+3dd30a3ca77ef5ab109a55ba603ff816ae5019436886093dccf8fd6a068f85f1 android.hardware.gnss@2.0::IGnssMeasurementCallback
9e66234e65bcde75733d75d8b5d5cc094c2a5e14b074a25cd3f9ad141dc56f60 android.hardware.gnss@2.0::types
50623a69a88b1c8a05738e4af7d5f78e905f415ccb0e84c99d0a71ea182e9393 android.hardware.gnss.measurement_corrections@1.0::IMeasurementCorrections
6ef12cd95df73f8f80c25eb035d98ca4594f9cee571fdabea838a0b6016dd908 android.hardware.gnss.measurement_corrections@1.0::types
diff --git a/gnss/2.0/IGnssMeasurementCallback.hal b/gnss/2.0/IGnssMeasurementCallback.hal
index d5dc038..d9751d3 100644
--- a/gnss/2.0/IGnssMeasurementCallback.hal
+++ b/gnss/2.0/IGnssMeasurementCallback.hal
@@ -22,77 +22,6 @@
/** The callback interface to report measurements from the HAL. */
interface IGnssMeasurementCallback extends @1.1::IGnssMeasurementCallback {
- /**
- * Enumeration of available values for the GNSS Measurement's code type. Similar to the
- * Attribute field described in RINEX 3.03, e.g., in Tables 4-10, and Table A2 at the RINEX 3.03
- * Update 1 Document.
- */
- enum GnssMeasurementCodeType : uint8_t {
- /** GALILEO E1A, GALILEO E6A, IRNSS L5A, IRNSS SA. */
- A = 0,
-
- /** GALILEO E1B, GALILEO E6B, IRNSS L5B, IRNSS SB. */
- B = 1,
-
- /**
- * GPS L1 C/A, GPS L2 C/A, GLONASS G1 C/A, GLONASS G2 C/A, GALILEO E1C, GALILEO E6C, SBAS
- * L1 C/A, QZSS L1 C/A, IRNSS L5C.
- */
- C = 2,
-
- /**
- * GPS L5 I, GLONASS G3 I, GALILEO E5a I, GALILEO E5b I, GALILEO E5a+b I, SBAS L5 I, QZSS L5
- * I, BDS B1 I, BDS B2 I, BDS B3 I.
- */
- I = 3,
-
- /** GPS L1C (P), GPS L2C (L), QZSS L1C (P), QZSS L2C (L), LEX(6) L. */
- L = 4,
-
- /** GPS L1M, GPS L2M. */
- M = 5,
-
- /** GPS L1P, GPS L2P, GLONASS G1P, GLONASS G2P. */
- P = 6,
-
- /**
- * GPS L5 Q, GLONASS G3 Q, GALILEO E5a Q, GALILEO E5b Q, GALILEO E5a+b Q, SBAS L5 Q, QZSS L5
- * Q, BDS B1 Q, BDS B2 Q, BDS B3 Q.
- */
- Q = 7,
-
- /** GPS L1C (D), GPS L2C (M), QZSS L1C (D), QZSS L2C (M), LEX(6) S. */
- S = 8,
-
- /** GPS L1 Z-tracking, GPS L2 Z-tracking. */
- W = 9,
-
- /**
- * GPS L1C (D+P), GPS L2C (M+L), GPS L5 (I+Q), GLONASS G3 (I+Q), GALILEO E1 (B+C), GALILEO
- * E5a (I+Q), GALILEO E5b (I+Q), GALILEO E5a+b(I+Q), GALILEO E6 (B+C), SBAS L5 (I+Q), QZSS
- * L1C (D+P), QZSS L2C (M+L), QZSS L5 (I+Q), LEX(6) (S+L), BDS B1 (I+Q), BDS B2 (I+Q), BDS
- * B3 (I+Q), IRNSS L5 (B+C).
- */
- X = 10,
-
- /** GPS L1Y, GPS L2Y. */
- Y = 11,
-
- /** GALILEO E1 (A+B+C), GALILEO E6 (A+B+C), QZSS L1-SAIF. */
- Z = 12,
-
- /** GPS L1 codeless, GPS L2 codeless. */
- N = 13,
-
- /**
- * Other code type that does not belong to any of the above code types.
- *
- * This code type is used in the case that the above code types do not cover all the code
- * types introduced in a new version of RINEX standard. When this code type is set, the
- * field GnssMeasurement.otherCodeTypeName must specify the new code type.
- */
- OTHER = 255
- };
/**
* Flags indicating the GNSS measurement state.
@@ -458,12 +387,43 @@
* The type of code that is currently being tracked in the GNSS measurement.
*
* For high precision applications the type of code being tracked needs to be considered
- * in-order to properly apply code specific corrections to the psuedorange measurements.
- */
- GnssMeasurementCodeType codeType;
-
- /**
- * The name of the code type when codeType is OTHER.
+ * in-order to properly apply code specific corrections to the pseudorange measurements.
+ *
+ * Value "A" represents GALILEO E1A, GALILEO E6A, IRNSS L5A, IRNSS SA.
+ *
+ * Value "B" represents GALILEO E1B, GALILEO E6B, IRNSS L5B, IRNSS SB.
+ *
+ * Value "C" represents GPS L1 C/A, GPS L2 C/A, GLONASS G1 C/A, GLONASS G2 C/A, GALILEO E1C,
+ * GALILEO E6C, SBAS L1 C/A, QZSS L1 C/A, IRNSS L5C.
+ *
+ * Value "I" represents GPS L5 I, GLONASS G3 I, GALILEO E5a I, GALILEO E5b I, GALILEO E5a+b I,
+ * SBAS L5 I, QZSS L5 I, BDS B1 I, BDS B2 I, BDS B3 I.
+ *
+ * Value "L" represents GPS L1C (P), GPS L2C (L), QZSS L1C (P), QZSS L2C (L), LEX(6) L.
+ *
+ * Value "M" represents GPS L1M, GPS L2M.
+ *
+ * Value "N" represents GPS L1 codeless, GPS L2 codeless.
+ *
+ * Value "P" represents GPS L1P, GPS L2P, GLONASS G1P, GLONASS G2P.
+ *
+ * Value "Q" represents GPS L5 Q, GLONASS G3 Q, GALILEO E5a Q, GALILEO E5b Q, GALILEO E5a+b Q,
+ * SBAS L5 Q, QZSS L5 Q, BDS B1 Q, BDS B2 Q, BDS B3 Q.
+ *
+ * Value "S" represents GPS L1C (D), GPS L2C (M), QZSS L1C (D), QZSS L2C (M), LEX(6) S.
+ *
+ * Value "W" represents GPS L1 Z-tracking, GPS L2 Z-tracking.
+ *
+ * Value "X" represents GPS L1C (D+P), GPS L2C (M+L), GPS L5 (I+Q), GLONASS G3 (I+Q),
+ * GALILEO E1 (B+C), GALILEO E5a (I+Q), GALILEO E5b (I+Q), GALILEO E5a+b(I+Q),
+ * GALILEO E6 (B+C), SBAS L5 (I+Q), QZSS L1C (D+P), QZSS L2C (M+L), QZSS L5 (I+Q),
+ * LEX(6) (S+L), BDS B1 (I+Q), BDS B2 (I+Q), BDS B3 (I+Q), IRNSS L5 (B+C).
+ *
+ * Value "Y" represents GPS L1Y, GPS L2Y.
+ *
+ * Value "Z" represents GALILEO E1 (A+B+C), GALILEO E6 (A+B+C), QZSS L1-SAIF.
+ *
+ * Value "UNKNOWN" represents the GNSS Measurement's code type is unknown.
*
* This is used to specify the observation descriptor defined in GNSS Observation Data File
* Header Section Description in the RINEX standard (Version 3.XX). In RINEX Version 3.03,
@@ -471,7 +431,7 @@
* "A channel"). In the future, if for instance a code "G" was added in the official RINEX
* standard, "G" could be specified here.
*/
- string otherCodeTypeName;
+ string codeType;
/**
* Per satellite sync state. It represents the current sync state for the associated
diff --git a/gnss/2.0/default/GnssMeasurement.cpp b/gnss/2.0/default/GnssMeasurement.cpp
index 702c9e2..a62c2dd 100644
--- a/gnss/2.0/default/GnssMeasurement.cpp
+++ b/gnss/2.0/default/GnssMeasurement.cpp
@@ -114,8 +114,7 @@
V1_1::IGnssMeasurementCallback::GnssMeasurement measurement_1_1 = {.v1_0 = measurement_1_0};
V2_0::IGnssMeasurementCallback::GnssMeasurement measurement_2_0 = {
.v1_1 = measurement_1_1,
- .codeType = IGnssMeasurementCallback::GnssMeasurementCodeType::C,
- .otherCodeTypeName = "",
+ .codeType = "C",
.state = GnssMeasurementState::STATE_CODE_LOCK | GnssMeasurementState::STATE_BIT_SYNC |
GnssMeasurementState::STATE_SUBFRAME_SYNC |
GnssMeasurementState::STATE_TOW_DECODED |
diff --git a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
index 3703eba..67fda89 100644
--- a/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
+++ b/gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
@@ -190,17 +190,7 @@
EXPECT_EQ(measurement_called_count_, 1);
ASSERT_TRUE(last_measurement_.measurements.size() > 0);
for (auto measurement : last_measurement_.measurements) {
- ASSERT_TRUE(
- ((int)measurement.codeType >=
- (int)IGnssMeasurementCallback_2_0::GnssMeasurementCodeType::A &&
- (int)measurement.codeType <=
- (int)IGnssMeasurementCallback_2_0::GnssMeasurementCodeType::N) ||
- (int)measurement.codeType ==
- (int)IGnssMeasurementCallback_2_0::GnssMeasurementCodeType::OTHER);
- if ((int)measurement.codeType ==
- (int)IGnssMeasurementCallback_2_0::GnssMeasurementCodeType::OTHER) {
- ASSERT_NE(measurement.otherCodeTypeName, "");
- }
+ ASSERT_NE(measurement.codeType, "");
}
iGnssMeasurement->close();