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

Commit 99af49b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[ANAPIC Review] Change the type of List by ANAPIC review" am: 533ac6b0 am: d71e7edf 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682126

Change-Id: Ief1868523ce48239a425552665690ebb7aaef4b5
parents c40e1d51 d71e7edf

telephony/java/android/telephony/CellSignalStrengthNr.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa 
     *

     *

     * Range [0, 15] for each CQI.

     * Range [0, 15] for each CQI.

     */

     */

    private List<Integer> mCsiCqiReport;;

    private List<Integer> mCsiCqiReport;

    private int mSsRsrp;

    private int mSsRsrp;

    private int mSsRsrq;

    private int mSsRsrq;

    private int mSsSinr;

    private int mSsSinr;
@@ -172,13 +172,13 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa 
     * @hide

     * @hide

     */

     */

    public CellSignalStrengthNr(int csiRsrp, int csiRsrq, int csiSinr, int csiCqiTableIndex,

    public CellSignalStrengthNr(int csiRsrp, int csiRsrq, int csiSinr, int csiCqiTableIndex,

            List<Integer> csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) {

            List<Byte> csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) {

        mCsiRsrp = inRangeOrUnavailable(csiRsrp, -140, -44);

        mCsiRsrp = inRangeOrUnavailable(csiRsrp, -140, -44);

        mCsiRsrq = inRangeOrUnavailable(csiRsrq, -20, -3);

        mCsiRsrq = inRangeOrUnavailable(csiRsrq, -20, -3);

        mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23);

        mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23);

        mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3);

        mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3);

        mCsiCqiReport = csiCqiReport.stream()

        mCsiCqiReport = csiCqiReport.stream()

                .map(cqi -> new Integer(inRangeOrUnavailable(cqi.intValue(), 1, 3)))

                .map(cqi -> new Integer(inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 1, 3)))

                .collect(Collectors.toList());

                .collect(Collectors.toList());

        mSsRsrp = inRangeOrUnavailable(ssRsrp, -140, -44);

        mSsRsrp = inRangeOrUnavailable(ssRsrp, -140, -44);

        mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20);

        mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20);

telephony/java/android/telephony/data/QosBearerFilter.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.List;

import java.util.Objects;

import java.util.Objects;







/**

/**

 * Class that stores QOS filter parameters as defined in

 * Class that stores QOS filter parameters as defined in

 * 3gpp 24.008 10.5.6.12 and 3gpp 24.501 9.11.4.13.

 * 3gpp 24.008 10.5.6.12 and 3gpp 24.501 9.11.4.13.