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

Commit 36f9e08d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9731922 from d9d9e71b to udc-release 

Change-Id: I15690c96685035a3004e7dc964a8a192dc6e4f0c
parents ea887768 d9d9e71b

gnss/aidl/android/hardware/gnss/GnssMeasurement.aidl

+44 −44
Original line number Original line Diff line number Diff line
@@ -133,50 +133,50 @@ parcelable GnssMeasurement { 
     * zero to the value in the table. The state flag with the widest range indicates the range of

     * zero to the value in the table. The state flag with the widest range indicates the range of

     * the received GNSS satellite time value.

     * the received GNSS satellite time value.

     *

     *

     * +---------------------------+--------------------+-----+-----------+--------------------+------+

     * +---------------------------+---------------------------+-----+---------------------------+--------------------+------+------+

     * |                           |GPS/QZSS            |GLNS |BDS        |GAL                 |SBAS  |

     * |                           |GPS/QZSS                   |GLNS |BDS                        |GAL                 |SBAS  |IRNSS |

     * +---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * +---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |State Flag	               |L1    |L5I   |L5Q   |L1OF |B1I   |B1I |E1B   |E1C   |E5AQ  |L1    |

     * |State Flag	               |L1    |L1C   |L5I   |L5Q   |L1OF |B1I   |B1I   |B1C   |B2AQ  |E1B   |E1C   |E5AQ  |L1    |L5C   |

     * |                           |C/A   |      |      |     |(D1)  |(D2)|      |      |      |C/A   |

     * |                           |C/A   |(P)   |      |      |     |(D1)  |(D2)  |(P)   |      |      |      |      |C/A   |      |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_UNKNOWN              |0     |0     |0     |0    |0     |0   |0     |0     |0     |0     |

     * |STATE_UNKNOWN              |0     |0     |0     |0     |0    |0     |0     |0     |0     |0     |0     |0     |0     |0     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_CODE_LOCK            |1ms   |1 ms  |1 ms  |1 ms |1 ms  |1 ms|-     |-     |1 ms  |1 ms  |

     * |STATE_CODE_LOCK            |1ms   |10 ms |1 ms  |1 ms  |1 ms |1 ms  |1 ms  |10 ms |1 ms  |-     |-     |1 ms  |1 ms  |1ms   |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_SYMBOL_SYNC          |20ms  |10 ms |1 ms  |10 ms|20 ms |2 ms|4 ms  |4 ms  |1 ms  |2 ms  |

     * |STATE_SYMBOL_SYNC          |-     |-     |10 ms |-     |10 ms|-     |2 ms  |-     |-     |-     |-     |-     |2 ms  |-     |

     * |                           |(opt.)|      |(opt.)|     |(opt.)|    |(opt.)|(opt.)|(opt.)|      |

     * |                           |      |      |      |      |     |      |      |      |      |      |      |      |      |      |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_BIT_SYNC             |20 ms |20 ms |1 ms  |20 ms|20 ms |-   |8 ms  |-     |1 ms  |4 ms  |

     * |STATE_BIT_SYNC             |20 ms |-     |20 ms |-     |20 ms|20 ms |-     |-     |-     |8 ms  |-     |-     |4 ms  |20 ms |

     * |                           |      |      |(opt.)|     |      |    |      |      |(opt.)|      |

     * |                           |      |      |      |      |     |      |      |      |      |      |      |      |      |      |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_SUBFRAME_SYNC        |6s    |6s    |-     |2 s  |6 s   |-   |-     |-     |100 ms|-     |

     * |STATE_SUBFRAME_SYNC        |6s    |-     |6s    |-     |-    |6 s   |-     |-     |100 ms|-     |-     |100 ms|-     |6s    |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_TOW_DECODED          |1 week|-     |-     |1 day|1 week|-   |1 week|-     |-     |1 week|

     * |STATE_TOW_DECODED          |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|

     * |STATE_TOW_KNOWN            |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|

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GLO_STRING_SYNC      |-     |-     |-     |2 s  |-     |-   |-     |-     |-     |-     |

     * |STATE_GLO_STRING_SYNC      |-     |-     |-     |-     |2 s  |-     |-     |-     |-     |-     |-     |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GLO_TOD_DECODED      |-     |-     |-     |1 day|-     |-   |-     |-     |-     |-     |

     * |STATE_GLO_TOD_DECODED      |-     |-     |-     |-     |1 day|-     |-     |-     |-     |-     |-     |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GLO_TOD_KNOWN        |-     |-     |-     |1 day|-     |-   |-     |-     |-     |-     |

     * |STATE_GLO_TOD_KNOWN        |-     |-     |-     |-     |1 day|-     |-     |-     |-     |-     |-     |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_BDS_D2_BIT_SYNC      |-     |-     |-     |-    |-     |2 ms|-     |-     |-     |-     |

     * |STATE_BDS_D2_BIT_SYNC      |-     |-     |-     |-     |-    |-     |2 ms  |-     |-     |-     |-     |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_BDS_D2_SUBFRAME_SYNC |-     |-     |-     |-    |-     |600 |-     |-     |-     |-     |

     * |STATE_BDS_D2_SUBFRAME_SYNC |-     |-     |-     |-     |-    |-     |600   |-     |-     |-     |-     |-     |-     |-     |

     * |                           |      |      |      |     |      |ms  |      |      |      |      |

     * |                           |      |      |      |      |     |      |ms    |      |      |      |      |      |      |      |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GAL_E1BC_CODE_LOCK   |-     |-     |-     |-    |-     |-   |4 ms  |4 ms  |-     |-     |

     * |STATE_GAL_E1BC_CODE_LOCK   |-     |-     |-     |-     |-    |-     |-     |-     |-     |4 ms  |4 ms  |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GAL_E1C_2ND_CODE_LOCK|-     |-     |-     |-    |-     |-   |-     |100 ms|-     |-     |

     * |STATE_GAL_E1C_2ND_CODE_LOCK|-     |-     |-     |-     |-    |-     |-     |-     |-     |-     |100 ms|-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_2ND_CODE_LOCK        |-     |10 ms |20 ms |-    |-     |-	  |-     |100 ms|100 ms|-     |

     * |STATE_2ND_CODE_LOCK        |-     |18000 |10 ms |20 ms |-    |-     |-	   |18000 |100 ms|-     |-     |100 ms|-     |-     |

     * |                           |      |(opt.)|      |     |      |    |      |(opt.)|      |      |

     * |                           |      |ms    |      |      |     |      |      |ms    |      |      |      |      |      |      |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_GAL_E1B_PAGE_SYNC    |-     |-     |-     |-    |-     |-   |2 s   |-     |-     |-     |

     * |STATE_GAL_E1B_PAGE_SYNC    |-     |-     |-     |-     |-    |-     |-     |-     |-     |2 s   |-     |-     |-     |-     |

     * |---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * |---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     * |STATE_SBAS_SYNC            |-     |-     |-     |-    |-     |-   |-     |-     |-     |1s    |

     * |STATE_SBAS_SYNC            |-     |-     |-     |-     |-    |-     |-     |-     |-     |-     |-     |-     |1s    |-     |

     * +---------------------------+------+------+------+-----+------+----+------+------+------+------+

     * +---------------------------+------+------+------+------+-----+------+------+------+------+------+------+------+------+------+

     *

     *

     * Note: TOW Known refers to the case where TOW is possibly not decoded over the air but has

     * Note: TOW Known refers to the case where TOW is possibly not decoded over the air but has

     * been determined from other sources. If TOW decoded is set then TOW Known must also be set.

     * been determined from other sources. If TOW decoded is set then TOW Known must also be set.

gnss/common/utils/default/Utils.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ GnssDataV2_0 Utils::getMockMeasurementV2_0() { 
            .receivedSvTimeUncertaintyInNs = 15,

            .receivedSvTimeUncertaintyInNs = 15,

            .cN0DbHz = 30.0,

            .cN0DbHz = 30.0,

            .pseudorangeRateMps = -484.13739013671875,

            .pseudorangeRateMps = -484.13739013671875,

            .pseudorangeRateUncertaintyMps = 1.0379999876022339,

            .pseudorangeRateUncertaintyMps = 0.1037999987602233,

            .accumulatedDeltaRangeState = (uint32_t)V1_0::IGnssMeasurementCallback::

            .accumulatedDeltaRangeState = (uint32_t)V1_0::IGnssMeasurementCallback::

                    GnssAccumulatedDeltaRangeState::ADR_STATE_UNKNOWN,

                    GnssAccumulatedDeltaRangeState::ADR_STATE_UNKNOWN,

            .accumulatedDeltaRangeM = 0.0,

            .accumulatedDeltaRangeM = 0.0,
@@ -169,7 +169,7 @@ GnssData Utils::getMockMeasurement(const bool enableCorrVecOutputs, const bool e 
            .basebandCN0DbHz = 26.5,

            .basebandCN0DbHz = 26.5,

            .agcLevelDb = 2.3,

            .agcLevelDb = 2.3,

            .pseudorangeRateMps = -484.13739013671875,

            .pseudorangeRateMps = -484.13739013671875,

            .pseudorangeRateUncertaintyMps = 1.0379999876022339,

            .pseudorangeRateUncertaintyMps = 0.1037999987602233,

            .accumulatedDeltaRangeState = GnssMeasurement::ADR_STATE_VALID,

            .accumulatedDeltaRangeState = GnssMeasurement::ADR_STATE_VALID,

            .accumulatedDeltaRangeM = 1.52,

            .accumulatedDeltaRangeM = 1.52,

            .accumulatedDeltaRangeUncertaintyM = 2.43,

            .accumulatedDeltaRangeUncertaintyM = 2.43,