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

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

Merge "Update Javadocs for CellInfo Classes" into qt-dev 

am: 96faca00

Change-Id: I547c5b1a2810d66e34effb0c72fede767071651d
parents 82de8543 96faca00

api/current.txt

+21 −21
Original line number Diff line number Diff line
@@ -44383,9 +44383,9 @@ package android.telephony { 
    method public int getCid();

    method public int getLac();

    method @Deprecated public int getMcc();

    method public String getMccString();

    method @Nullable public String getMccString();

    method @Deprecated public int getMnc();

    method public String getMncString();

    method @Nullable public String getMncString();

    method @Nullable public String getMobileNetworkOperator();

    method @Deprecated public int getPsc();

    method public void writeToParcel(android.os.Parcel, int);
@@ -44397,9 +44397,9 @@ package android.telephony { 
    method public int getCi();

    method public int getEarfcn();

    method @Deprecated public int getMcc();

    method public String getMccString();

    method @Nullable public String getMccString();

    method @Deprecated public int getMnc();

    method public String getMncString();

    method @Nullable public String getMncString();

    method @Nullable public String getMobileNetworkOperator();

    method public int getPci();

    method public int getTac();
@@ -44422,8 +44422,8 @@ package android.telephony { 
    method public int getCid();

    method public int getCpid();

    method public int getLac();

    method public String getMccString();

    method public String getMncString();

    method @Nullable public String getMccString();

    method @Nullable public String getMncString();

    method @Nullable public String getMobileNetworkOperator();

    method public int getUarfcn();

    method public void writeToParcel(android.os.Parcel, int);
@@ -44434,9 +44434,9 @@ package android.telephony { 
    method public int getCid();

    method public int getLac();

    method @Deprecated public int getMcc();

    method public String getMccString();

    method @Nullable public String getMccString();

    method @Deprecated public int getMnc();

    method public String getMncString();

    method @Nullable public String getMncString();

    method @Nullable public String getMobileNetworkOperator();

    method public int getPsc();

    method public int getUarfcn();
@@ -44459,22 +44459,22 @@ package android.telephony { 
  }















  public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {













    method public android.telephony.CellIdentityCdma getCellIdentity();













    method public android.telephony.CellSignalStrengthCdma getCellSignalStrength();













    method @NonNull public android.telephony.CellIdentityCdma getCellIdentity();













    method @NonNull public android.telephony.CellSignalStrengthCdma getCellSignalStrength();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoCdma> CREATOR;















  }





























  public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {













    method public android.telephony.CellIdentityGsm getCellIdentity();













    method public android.telephony.CellSignalStrengthGsm getCellSignalStrength();













    method @NonNull public android.telephony.CellIdentityGsm getCellIdentity();













    method @NonNull public android.telephony.CellSignalStrengthGsm getCellSignalStrength();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoGsm> CREATOR;















  }





























  public final class CellInfoLte extends android.telephony.CellInfo implements android.os.Parcelable {













    method public android.telephony.CellIdentityLte getCellIdentity();













    method public android.telephony.CellSignalStrengthLte getCellSignalStrength();













    method @NonNull public android.telephony.CellIdentityLte getCellIdentity();













    method @NonNull public android.telephony.CellSignalStrengthLte getCellSignalStrength();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoLte> CREATOR;















  }










@@ -44510,7 +44510,7 @@ package android.telephony {













    method public abstract boolean equals(Object);















    method public abstract int getAsuLevel();















    method public abstract int getDbm();













    method public abstract int getLevel();













    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public abstract int getLevel();















    method public abstract int hashCode();















    field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3















    field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4









@@ -44530,7 +44530,7 @@ package android.telephony {













    method public int getEvdoEcio();















    method public int getEvdoLevel();















    method public int getEvdoSnr();













    method public int getLevel();













    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthCdma> CREATOR;















  }









@@ -44540,7 +44540,7 @@ package android.telephony {













    method public int getAsuLevel();















    method public int getBitErrorRate();















    method public int getDbm();













    method public int getLevel();













    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();















    method public int getTimingAdvance();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthGsm> CREATOR;









@@ -44551,7 +44551,7 @@ package android.telephony {













    method public int getAsuLevel();















    method public int getCqi();















    method public int getDbm();













    method public int getLevel();













    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();















    method public int getRsrq();















    method public int getRssi();









@@ -44568,7 +44568,7 @@ package android.telephony {













    method public int getCsiRsrq();















    method public int getCsiSinr();















    method public int getDbm();













    method public int getLevel();













    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();















    method public int getSsRsrp();















    method public int getSsRsrq();















    method public int getSsSinr();









@@ -44580,7 +44580,7 @@ package android.telephony {













    method public int describeContents();















    method public int getAsuLevel();















    method public int getDbm();













    method public int getLevel();













    method @IntRange(from=0, to=4) public int getLevel();















    method public int getRscp();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthTdscdma> CREATOR;









@@ -44590,7 +44590,7 @@ package android.telephony {













    method public int describeContents();















    method public int getAsuLevel();















    method public int getDbm();













    method public int getLevel();













    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public int getLevel();















    method public void writeToParcel(android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellSignalStrengthWcdma> CREATOR;















  }

























telephony/java/android/telephony/CellIdentityGsm.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -166,6 +166,7 @@ public final class CellIdentityGsm extends CellIdentity {













    /**















     * @return Mobile Country Code in string format, null if unavailable.















     */













    @Nullable















    public String getMccString() {















        return mMccStr;















    }









@@ -173,6 +174,7 @@ public final class CellIdentityGsm extends CellIdentity {













    /**















     * @return Mobile Network Code in string format, null if unavailable.















     */













    @Nullable















    public String getMncString() {















        return mMncStr;















    }

































telephony/java/android/telephony/CellIdentityLte.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -187,6 +187,7 @@ public final class CellIdentityLte extends CellIdentity {













    /**















     * @return Mobile Country Code in string format, null if unavailable.















     */













    @Nullable















    public String getMccString() {















        return mMccStr;















    }









@@ -194,6 +195,7 @@ public final class CellIdentityLte extends CellIdentity {













    /**















     * @return Mobile Network Code in string format, null if unavailable.















     */













    @Nullable















    public String getMncString() {















        return mMncStr;















    }

































telephony/java/android/telephony/CellIdentityTdscdma.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -104,6 +104,7 @@ public final class CellIdentityTdscdma extends CellIdentity {













     * Get Mobile Country Code in string format















     * @return Mobile Country Code in string format, null if unknown















     */













    @Nullable















    public String getMccString() {















        return mMccStr;















    }









@@ -112,6 +113,7 @@ public final class CellIdentityTdscdma extends CellIdentity {













     * Get Mobile Network Code in string format















     * @return Mobile Network Code in string format, null if unknown















     */













    @Nullable















    public String getMncString() {















        return mMncStr;















    }

































telephony/java/android/telephony/CellIdentityWcdma.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -150,6 +150,7 @@ public final class CellIdentityWcdma extends CellIdentity {













    /**















     * @return Mobile Country Code in string version, null if unavailable.















     */













    @Nullable















    public String getMccString() {















        return mMccStr;















    }









@@ -157,6 +158,7 @@ public final class CellIdentityWcdma extends CellIdentity {













    /**















     * @return Mobile Network Code in string version, null if unavailable.















     */













    @Nullable















    public String getMncString() {















        return mMncStr;















    }