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

Commit c66121b3 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Move Annotations for getCellSignalStrengths" am: 5ba92cf9 

am: 7c59ddb0

Change-Id: Ife18dafa8c9a910dfa4a80c76e3bc445b0c23e5f
parents 74a88361 7c59ddb0

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -42762,7 +42762,7 @@ package android.telephony { 
    method @Deprecated public int getCdmaDbm();

    method @Deprecated public int getCdmaEcio();

    method @NonNull public java.util.List<android.telephony.CellSignalStrength> getCellSignalStrengths();

    method public <T extends android.telephony.CellSignalStrength> java.util.List<T> getCellSignalStrengths(@NonNull Class<T>);

    method @NonNull public <T extends android.telephony.CellSignalStrength> java.util.List<T> getCellSignalStrengths(@NonNull Class<T>);

    method @Deprecated public int getEvdoDbm();

    method @Deprecated public int getEvdoEcio();

    method @Deprecated public int getEvdoSnr();

telephony/java/android/telephony/SignalStrength.java

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class SignalStrength implements Parcelable { 
     * @see android.telephony#CellSignalStrengthCdma

     * @see android.telephony#CellSignalStrengthGsm

     */

    public @NonNull List<CellSignalStrength> getCellSignalStrengths() {

    @NonNull public List<CellSignalStrength> getCellSignalStrengths() {

        return getCellSignalStrengths(CellSignalStrength.class);

    }
@@ -240,7 +240,7 @@ public class SignalStrength implements Parcelable { 
     * @see android.telephony#CellSignalStrengthCdma

     * @see android.telephony#CellSignalStrengthGsm

     */

    public <T extends CellSignalStrength> @NonNull List<T> getCellSignalStrengths(

    @NonNull public <T extends CellSignalStrength> List<T> getCellSignalStrengths(

            @NonNull Class<T> clazz) {

        List<T> cssList = new ArrayList<>(2); // Usually have 2 or fewer elems

        if (mLte.isValid() && clazz.isAssignableFrom(CellSignalStrengthLte.class)) {