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

Commit a36756c1 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Use averagingWindowMillis instead of averagingWindowMs"

parents bdb0d88c 16da4b83

src/java/com/android/internal/telephony/RILUtils.java

+6 −2
Original line number Diff line number Diff line
@@ -3869,9 +3869,13 @@ public class RILUtils { 
                        convertHalQosBandwidth(eps.uplink), eps.qci);

            case android.hardware.radio.data.Qos.nr:

                android.hardware.radio.data.NrQos nr = qos.getNr();

                int averagingWindowMs = nr.averagingWindowMillis;

                if (averagingWindowMs

                        == android.hardware.radio.data.NrQos.AVERAGING_WINDOW_UNKNOWN) {

                    averagingWindowMs = nr.averagingWindowMs;

                }

                return new NrQos(convertHalQosBandwidth(nr.downlink),

                        convertHalQosBandwidth(nr.uplink), nr.qosFlowIdentifier, nr.fiveQi,

                        nr.averagingWindowMs);

                        convertHalQosBandwidth(nr.uplink), nr.qfi, nr.fiveQi, averagingWindowMs);

            default:

                return null;

        }