Make CQI APIs public

Include CellSignalStrengthLte#getCqiTableIndex,
CellSignalStrengthNr#getCsiCqiTableIndex, and
CellSignalStrengthNr#getCsiCqiReport.

Bug: 174771616
Test: make & cts CellInfoTest
Change-Id: I4a73558363279de6ac0f99d14aa3ed3b16d5c677
This commit is contained in:
Mingming Cai
2020-12-03 11:36:29 -08:00
parent 4e3959e571
commit dc160baf99
3 changed files with 15 additions and 6 deletions

View File

@@ -40505,7 +40505,8 @@ package android.telephony {
public final class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
method public int describeContents();
method public int getAsuLevel();
method public int getCqi();
method @IntRange(from=0, to=15) public int getCqi();
method @IntRange(from=1, to=6) public int getCqiTableIndex();
method public int getDbm();
method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();
method public int getRsrp();
@@ -40520,6 +40521,8 @@ package android.telephony {
public final class CellSignalStrengthNr extends android.telephony.CellSignalStrength implements android.os.Parcelable {
method public int describeContents();
method public int getAsuLevel();
method @IntRange(from=0, to=15) @NonNull public java.util.List<java.lang.Integer> getCsiCqiReport();
method @IntRange(from=1, to=3) public int getCsiCqiTableIndex();
method public int getCsiRsrp();
method public int getCsiRsrq();
method public int getCsiSinr();

View File

@@ -443,10 +443,12 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
/**
* Get table index for channel quality indicator
*
* Reference: 3GPP TS 136.213 section 7.2.3.
*
* @return the CQI table index if available or
* {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE} if unavailable.
*/
/** @hide */
@IntRange(from = 1, to = 6)
public int getCqiTableIndex() {
return mCqiTableIndex;
}
@@ -454,9 +456,12 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
/**
* Get channel quality indicator
*
* Reference: 3GPP TS 136.213 section 7.2.3.
*
* @return the CQI if available or
* {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE} if unavailable.
*/
@IntRange(from = 0, to = 15)
public int getCqi() {
return mCqi;
}

View File

@@ -294,9 +294,10 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
*
* Reference: 3GPP TS 138.214 section 5.2.2.1.
*
* Range [1, 3].
* @return the CQI table index if available or
* {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE} if unavailable.
*/
/** @hide */
@IntRange(from = 1, to = 3)
public int getCsiCqiTableIndex() {
return mCsiCqiTableIndex;
}
@@ -310,10 +311,10 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
*
* Reference: 3GPP TS 138.214 section 5.2.2.1.
*
* Range [0, 15] for each CQI.
* @return the CQIs for all subbands if available or empty list if unavailable.
*/
/** @hide */
@NonNull
@IntRange(from = 0, to = 15)
public List<Integer> getCsiCqiReport() {
return mCsiCqiReport;
}