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

Commit 4fbd8077 authored by Sarah Chin's avatar Sarah Chin
Browse files

Change averagingWindowMs to int 

Revert changes for qfi and apply them to averagingWindowMs instead
This is functionally the same change as ag/20886209

Test: build
Bug: 264261216
Change-Id: I053c3d6b8ca1464156bd5e65fe0316f27e962beb
parent c20cbaeb

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

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

  int fiveQi;

  android.hardware.radio.data.QosBandwidth downlink;

  android.hardware.radio.data.QosBandwidth downlink;

  android.hardware.radio.data.QosBandwidth uplink;

  android.hardware.radio.data.QosBandwidth uplink;

  byte qfi;

  /**

  /**

   * @deprecated use qosFlowIdentifier.

   * @deprecated use averagingWindowMillis;

   */

   */

  byte qfi;

  char averagingWindowMs;

  char averagingWindowMs;

  int qosFlowIdentifier;

  int averagingWindowMillis = AVERAGING_WINDOW_UNKNOWN;

  const byte FLOW_ID_RANGE_MIN = 1;

  const byte FLOW_ID_RANGE_MIN = 1;

  const byte FLOW_ID_RANGE_MAX = 63;

  const byte FLOW_ID_RANGE_MAX = 63;

  const int AVERAGING_WINDOW_UNKNOWN = (-1);

}
 
}

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

+10 −5
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ parcelable NrQos { 
    const byte FLOW_ID_RANGE_MIN = 1;

    const byte FLOW_ID_RANGE_MIN = 1;

    const byte FLOW_ID_RANGE_MAX = 63;

    const byte FLOW_ID_RANGE_MAX = 63;





    const int AVERAGING_WINDOW_UNKNOWN = -1;



    /**

    /**

     * 5G QOS Identifier (5QI), see 3GPP TS 24.501 and 23.501. The allowed values are standard

     * 5G QOS Identifier (5QI), see 3GPP TS 24.501 and 23.501. The allowed values are standard

     * values (1-9, 65-68, 69-70, 75, 79-80, 82-85) defined in the spec and operator specific values

     * values (1-9, 65-68, 69-70, 75, 79-80, 82-85) defined in the spec and operator specific values
@@ -36,13 +38,16 @@ parcelable NrQos { 
    QosBandwidth downlink;

    QosBandwidth downlink;

    QosBandwidth uplink;

    QosBandwidth uplink;

    /**

    /**

     * @deprecated use qosFlowIdentifier.

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

     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX).

     */

     */

    byte qfi;

    byte qfi;

    /**

     * @deprecated use averagingWindowMillis;

     */

    char averagingWindowMs;

    char averagingWindowMs;

    /**

    /**

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

     * The duration over which flow rates are calculated.

     * (FLOW_ID_RANGE_MIN, FLOW_ID_RANGE_MAX).

     */

     **/

    int averagingWindowMillis = AVERAGING_WINDOW_UNKNOWN;

    int qosFlowIdentifier;

}
 
}

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

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

            .fiveQi = qos.fiveQi,

            .downlink = toAidl(qos.downlink),

            .downlink = toAidl(qos.downlink),

            .uplink = toAidl(qos.uplink),

            .uplink = toAidl(qos.uplink),

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

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

            .averagingWindowMs = qos.averagingWindowMs,

            .averagingWindowMillis = qos.averagingWindowMs,

    };

    };

}

}