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

Commit bbe345fa authored by Nathan Harold's avatar Nathan Harold
Browse files

Move Annotations for getCellSignalStrengths 

As per API council script's feedback, the scripts
do not support having nullable annotations preceding
the return tupe. Moving the @NonNull annotations to a
script friendly location.

Bug: 126700393
Test: make update-api && make
      && make offline-sdk-docs (no functional change)
Change-Id: Ie063ffa2e311f4eb7d9e07cd5ee212af97d9d45d
parent b967dce9

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)) {