Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[ANAPIC Review] Change the type of List by ANAPIC review"

Browse Source 
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
This commit is contained in:
Jack Yu
2021-04-16 21:00:36 +00:00
parent f9d768410b
commit c94f691019
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CellSignalStrengthNr.java
View File

@@ -134,7 +134,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
*
* Range [0, 15] for each CQI.
*/
private List<Integer> mCsiCqiReport;
private List<Integer> 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<Byte> csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) {
List<Integer> 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);

1
telephony/java/android/telephony/data/QosBearerFilter.java
View File

@@ -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.