diff --git a/location/java/android/location/GnssMeasurement.java b/location/java/android/location/GnssMeasurement.java
index ab3dafe9cec77..b0769abce2956 100644
--- a/location/java/android/location/GnssMeasurement.java
+++ b/location/java/android/location/GnssMeasurement.java
@@ -497,24 +497,29 @@ public final class GnssMeasurement implements Parcelable {
*
*
* |
- * GPS/QZSS |
+ * GPS/QZSS |
* GLNS |
- * BDS |
+ * BDS |
* GAL |
* SBAS |
+ * IRNSS |
*
*
* | State Flag |
* L1 C/A |
+ * L1 C(P) |
* L5I |
* L5Q |
* L1OF |
* B1I (D1) |
- * B1I (D2) |
+ * B1I (D2) |
+ * B1C (P) |
+ * B2AQ |
* E1B |
* E1C |
* E5AQ |
* L1 C/A |
+ * L5C |
*
*
*
@@ -532,87 +537,123 @@ public final class GnssMeasurement implements Parcelable {
* 0 |
* 0 |
* 0 |
+ * 0 |
+ * 0 |
+ * 0 |
+ * 0 |
*
*
* |
* STATE_CODE_LOCK
* |
* 1 ms |
+ * 10 ms |
* 1 ms |
* 1 ms |
* 1 ms |
* 1 ms |
* 1 ms |
+ * 10 ms |
+ * 1 ms |
* - |
* - |
* 1 ms |
* 1 ms |
+ * 1 ms |
*
*
* |
* STATE_SYMBOL_SYNC
* |
- * 20 ms (optional) |
+ * - |
+ * - |
* 10 ms |
- * 1 ms (optional) |
+ * - |
* 10 ms |
- * 20 ms (optional) |
+ * - |
* 2 ms |
- * 4 ms (optional) |
- * 4 ms (optional) |
- * 1 ms (optional) |
+ * - |
+ * - |
+ * - |
+ * - |
+ * - |
* 2 ms |
+ * - |
*
*
* |
* STATE_BIT_SYNC
* |
* 20 ms |
+ * - |
* 20 ms |
- * 1 ms (optional) |
+ * - |
* 20 ms |
* 20 ms |
* - |
+ * - |
+ * - |
* 8 ms |
* - |
- * 1 ms (optional) |
+ * - |
* 4 ms |
+ * 20 ms |
*
*
* |
* STATE_SUBFRAME_SYNC
* |
- * 6s |
- * 6s |
- * - |
- * 2 s |
* 6 s |
* - |
+ * 6 s |
+ * - |
+ * - |
+ * 6 s |
* - |
* - |
* 100 ms |
* - |
+ * - |
+ * 100 ms |
+ * - |
+ * 6 s |
*
*
* |
* STATE_TOW_DECODED
* |
- * 1 week |
+ * 1 week |
* - |
- * 1 day |
- * 1 week |
- * 1 week |
+ * 1 week |
* - |
+ * - |
+ * 1 week |
+ * 1 week |
+ * - |
+ * - |
+ * 1 week |
+ * 1 week |
+ * - |
+ * 1 week |
* 1 week |
*
*
* |
* STATE_TOW_KNOWN
* |
- * 1 week |
- * 1 day |
- * 1 week |
- * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * - |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
+ * 1 week |
* 1 week |
*
*
@@ -622,6 +663,7 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
* 2 s |
* - |
* - |
@@ -629,6 +671,9 @@ public final class GnssMeasurement implements Parcelable {
* - |
* - |
* - |
+ * - |
+ * - |
+ * - |
*
*
* |
@@ -637,6 +682,7 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
* 1 day |
* - |
* - |
@@ -644,6 +690,9 @@ public final class GnssMeasurement implements Parcelable {
* - |
* - |
* - |
+ * - |
+ * - |
+ * - |
*
*
* |
@@ -652,6 +701,7 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
* 1 day |
* - |
* - |
@@ -659,6 +709,9 @@ public final class GnssMeasurement implements Parcelable {
* - |
* - |
* - |
+ * - |
+ * - |
+ * - |
*
*
* |
@@ -669,11 +722,15 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
* 2 ms |
* - |
* - |
* - |
* - |
+ * - |
+ * - |
+ * - |
*
*
* |
@@ -684,11 +741,15 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
* 600 ms |
* - |
* - |
* - |
* - |
+ * - |
+ * - |
+ * - |
*
*
* |
@@ -700,10 +761,14 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
+ * - |
+ * - |
* 4 ms |
* 4 ms |
* - |
* - |
+ * - |
*
*
* |
@@ -716,24 +781,32 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
+ * - |
+ * - |
* 100 ms |
* - |
* - |
+ * - |
*
*
* |
* STATE_2ND_CODE_LOCK
* |
* - |
- * 10 ms (optional) |
+ * 18000 ms |
+ * 10 ms |
* 20 ms |
* - |
* - |
* - |
- * - |
- * 100 ms (optional) |
+ * 18000 ms |
* 100 ms |
* - |
+ * - |
+ * 100 ms |
+ * - |
+ * - |
*
*
* |
@@ -745,10 +818,14 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
+ * - |
+ * - |
* 2 s |
* - |
* - |
* - |
+ * - |
*
*
* |
@@ -763,7 +840,11 @@ public final class GnssMeasurement implements Parcelable {
* | - |
* - |
* - |
+ * - |
+ * - |
+ * - |
* 1 s |
+ * - |
*
*
*