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

Commit f513b92e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change NrQos qfi from byte to int"

parents f8f5cf9f 5d404b4c

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,

    };

}