Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev

This commit is contained in:
Wink Saville
2012-08-28 12:34:22 -07:00
committed by Android (Google) Code Review
5 changed files with 20 additions and 34 deletions

View File

@ -20439,6 +20439,9 @@ package android.telephony {
public abstract class CellSignalStrength implements android.os.Parcelable {
method public int describeContents();
method public abstract boolean equals(java.lang.Object);
method public abstract int getAsuLevel();
method public abstract int getDbm();
method public abstract int getLevel();
method public abstract int hashCode();
method public abstract void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@ -20446,11 +20449,16 @@ package android.telephony {
public class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
method public boolean equals(java.lang.Object);
method public int getAsuLevel();
method public int getCdmaDbm();
method public int getCdmaEcio();
method public int getCdmaLevel();
method public int getDbm();
method public int getEvdoDbm();
method public int getEvdoEcio();
method public int getEvdoLevel();
method public int getEvdoSnr();
method public int getLevel();
method public int hashCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@ -20458,6 +20466,9 @@ package android.telephony {
public class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
method public boolean equals(java.lang.Object);
method public int getAsuLevel();
method public int getDbm();
method public int getLevel();
method public int hashCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
@ -20465,6 +20476,9 @@ package android.telephony {
public class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
method public boolean equals(java.lang.Object);
method public int getAsuLevel();
method public int getDbm();
method public int getLevel();
method public int getTimingAdvance();
method public int hashCode();
method public void writeToParcel(android.os.Parcel, int);

View File

@ -59,22 +59,16 @@ public abstract class CellSignalStrength implements Parcelable {
/**
* Get signal level as an int from 0..4
*
* @hide
*/
public abstract int getLevel();
/**
* Get the signal level as an asu value between 0..31, 99 is unknown
*
* @hide
*/
public abstract int getAsuLevel();
/**
* Get the signal strength as dBm
*
* @hide
*/
public abstract int getDbm();

View File

@ -113,9 +113,7 @@ public class CellSignalStrengthCdma extends CellSignalStrength implements Parcel
}
/**
* Get LTE as level 0..4
*
* @hide
* Get signal level as an int from 0..4
*/
@Override
public int getLevel() {
@ -140,8 +138,6 @@ public class CellSignalStrengthCdma extends CellSignalStrength implements Parcel
/**
* Get the LTE signal level as an asu value between 0..97, 99 is unknown
* Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
*
* @hide
*/
@Override
public int getAsuLevel() {
@ -172,8 +168,6 @@ public class CellSignalStrengthCdma extends CellSignalStrength implements Parcel
/**
* Get cdma as level 0..4
*
* @hide
*/
public int getCdmaLevel() {
final int cdmaDbm = getCdmaDbm();
@ -201,8 +195,6 @@ public class CellSignalStrengthCdma extends CellSignalStrength implements Parcel
/**
* Get Evdo as level 0..4
*
* @hide
*/
public int getEvdoLevel() {
int evdoDbm = getEvdoDbm();
@ -228,9 +220,7 @@ public class CellSignalStrengthCdma extends CellSignalStrength implements Parcel
}
/**
* Get as dBm
*
* @hide
* Get the signal strength as dBm
*/
@Override
public int getDbm() {

View File

@ -100,9 +100,7 @@ public class CellSignalStrengthGsm extends CellSignalStrength implements Parcela
}
/**
* Get LTE as level 0..4
*
* @hide
* Get signal level as an int from 0..4
*/
@Override
public int getLevel() {
@ -123,9 +121,7 @@ public class CellSignalStrengthGsm extends CellSignalStrength implements Parcela
}
/**
* Get LTE as dBm
*
* @hide
* Get the signal strength as dBm
*/
@Override
public int getDbm() {
@ -145,8 +141,6 @@ public class CellSignalStrengthGsm extends CellSignalStrength implements Parcela
/**
* Get the LTE signal level as an asu value between 0..97, 99 is unknown
* Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
*
* @hide
*/
@Override
public int getAsuLevel() {

View File

@ -134,9 +134,7 @@ public class CellSignalStrengthLte extends CellSignalStrength implements Parcela
}
/**
* Get LTE as level 0..4
*
* @hide
* Get signal level as an int from 0..4
*/
@Override
public int getLevel() {
@ -170,9 +168,7 @@ public class CellSignalStrengthLte extends CellSignalStrength implements Parcela
}
/**
* Get LTE as dBm
*
* @hide
* Get signal strength as dBm
*/
@Override
public int getDbm() {
@ -182,8 +178,6 @@ public class CellSignalStrengthLte extends CellSignalStrength implements Parcela
/**
* Get the LTE signal level as an asu value between 0..97, 99 is unknown
* Asu is calculated based on 3GPP RSRP. Refer to 3GPP 27.007 (Ver 10.3.0) Sec 8.69
*
* @hide
*/
@Override
public int getAsuLevel() {