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

Commit 19bca8d1 authored by Mingming Cai's avatar Mingming Cai Committed by Automerger Merge Worker
Browse files

Merge "Make CQI APIs public" am: 8c190b46 am: 1cfb7f99 am: 5170952e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2c2d35e37448152aa07dd09551f029ff9ad1314
parents 905e9b31 5170952e

core/api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -40976,7 +40976,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();
@@ -40991,6 +40992,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();

telephony/java/android/telephony/CellSignalStrengthLte.java

+6 −1
Original line number Diff line number Diff line
@@ -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;

    }

telephony/java/android/telephony/CellSignalStrengthNr.java

+5 −4
Original line number Diff line number Diff line
@@ -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;

    }