From c94f691019cbcbaa6c1bfe5538d2d36d1c0a3e0e Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 16 Apr 2021 21:00:36 +0000 Subject: [PATCH] Revert "[ANAPIC Review] Change the type of List by ANAPIC review" Revert "[ANAPIC Review] Modify radio 1.6 based on ANAPIC comment..." Revert "[ANAPIC Review] Modify radio 1.6 in telephony side" Revert submission 14098561-ANAPIC_1_6 Reason for revert: broke the builds Reverted Changes: Ibcbdc0cac:[ANAPIC Review] Change the type of List by ANAPIC ... Ie8d40439e:[ANAPIC Review] Modify radio 1.6 in telephony side... I24106cba4:[ANAPIC Review] Modify radio 1.6 based on ANAPIC c... I71b0d0014:[ANAPIC Review] Modify radio 1.6 based on ANAPIC c... Change-Id: I33ee563f99b56ed478656474dc24c030f35ebf44 --- .../java/android/telephony/CellSignalStrengthNr.java | 8 ++++---- .../java/android/telephony/data/QosBearerFilter.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/telephony/java/android/telephony/CellSignalStrengthNr.java b/telephony/java/android/telephony/CellSignalStrengthNr.java index ac01afa517290..bde62fb2977cc 100644 --- a/telephony/java/android/telephony/CellSignalStrengthNr.java +++ b/telephony/java/android/telephony/CellSignalStrengthNr.java @@ -134,7 +134,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa * * Range [0, 15] for each CQI. */ - private List mCsiCqiReport; + private List mCsiCqiReport;; private int mSsRsrp; private int mSsRsrq; private int mSsSinr; @@ -172,13 +172,13 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa * @hide */ public CellSignalStrengthNr(int csiRsrp, int csiRsrq, int csiSinr, int csiCqiTableIndex, - List csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) { + List csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) { mCsiRsrp = inRangeOrUnavailable(csiRsrp, -140, -44); mCsiRsrq = inRangeOrUnavailable(csiRsrq, -20, -3); mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23); mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3); - mCsiCqiReport = csiCqiReport.stream() - .map(cqi -> new Integer(inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 1, 3))) + mCsiCqiReport = csiCqiReport.stream() + .map(cqi -> new Integer(inRangeOrUnavailable(cqi.intValue(), 1, 3))) .collect(Collectors.toList()); mSsRsrp = inRangeOrUnavailable(ssRsrp, -140, -44); mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20); diff --git a/telephony/java/android/telephony/data/QosBearerFilter.java b/telephony/java/android/telephony/data/QosBearerFilter.java index 5642549d73138..6c1c653f13d05 100644 --- a/telephony/java/android/telephony/data/QosBearerFilter.java +++ b/telephony/java/android/telephony/data/QosBearerFilter.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; + /** * Class that stores QOS filter parameters as defined in * 3gpp 24.008 10.5.6.12 and 3gpp 24.501 9.11.4.13.