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

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

Snap for 9343563 from 1de61cdb to udc-release 

Change-Id: I3d0d694a9feceae72373c04368855ad1fe9a4aa8
parents e5c27279 1de61cdb

gnss/aidl/vts/gnss_hal_test.cpp

+3 −1
Original line number Diff line number Diff line
@@ -489,8 +489,10 @@ void GnssHalTest::checkGnssDataFields(const sp<GnssMeasurementCallbackAidl>& cal 
        // Validity check GnssData fields

        checkGnssMeasurementClockFields(lastGnssData);

        if (aidl_gnss_hal_->getInterfaceVersion() >= 3) {

            if (isFullTracking) {

                EXPECT_EQ(lastGnssData.isFullTracking, isFullTracking);

            }

        }

        for (const auto& measurement : lastGnssData.measurements) {

            checkGnssMeasurementFields(measurement, lastGnssData);

        }

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/NrQos.aidl

+4 −0
Original line number Diff line number Diff line
@@ -37,8 +37,12 @@ parcelable NrQos { 
  int fiveQi;

  android.hardware.radio.data.QosBandwidth downlink;

  android.hardware.radio.data.QosBandwidth uplink;

  /**

   * @deprecated use qosFlowIdentifier.

   */

  byte qfi;

  char averagingWindowMs;

  int qosFlowIdentifier;

  const byte FLOW_ID_RANGE_MIN = 1;

  const byte FLOW_ID_RANGE_MAX = 63;

}

radio/aidl/android/hardware/radio/data/NrQos.aidl

+6 −2
Original line number Diff line number Diff line
@@ -36,9 +36,13 @@ parcelable NrQos { 
    QosBandwidth downlink;

    QosBandwidth uplink;

    /**

     * QOS flow identifier of the QOS flow description in the range

     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX)

     * @deprecated use qosFlowIdentifier.

     */

    byte qfi;

    char averagingWindowMs;

    /**

     * QOS flow identifier of the QOS flow description in the range

     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX).

     **/

    int qosFlowIdentifier;

}

radio/aidl/compat/libradiocompat/data/structs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static aidl::NrQos toAidl(const V1_6::NrQos& qos) { 
            .fiveQi = qos.fiveQi,

            .downlink = toAidl(qos.downlink),

            .uplink = toAidl(qos.uplink),

            .qfi = static_cast<int8_t>(qos.qfi),

            .qosFlowIdentifier = static_cast<int8_t>(qos.qfi),

            .averagingWindowMs = qos.averagingWindowMs,

    };

}

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -892,6 +892,7 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) { 


        ASSERT_TRUE(result == ErrorCode::CANNOT_ATTEST_IDS || result == ErrorCode::INVALID_TAG)

                << "result = " << result;

        device_id_attestation_vsr_check(result);

    }

    CheckedDeleteKey(&attest_key.keyBlob);

}