am becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev

* commit 'becddea63e2c4b414e5eac2841d3516c4e89bb24':
  Unhide signal strength constants used by getLevel.
This commit is contained in:
Casey Ho
2015-07-06 22:31:35 +00:00
committed by Android Git Automerger
3 changed files with 22 additions and 5 deletions

View File

@@ -30690,6 +30690,11 @@ package android.telephony {
method public abstract int getDbm();
method 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
field public static final int SIGNAL_STRENGTH_MODERATE = 2; // 0x2
field public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; // 0x0
field public static final int SIGNAL_STRENGTH_POOR = 1; // 0x1
}
public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {

View File

@@ -32922,6 +32922,11 @@ package android.telephony {
method public abstract int getDbm();
method 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
field public static final int SIGNAL_STRENGTH_MODERATE = 2; // 0x2
field public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; // 0x0
field public static final int SIGNAL_STRENGTH_POOR = 1; // 0x1
}
public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {

View File

@@ -21,18 +21,19 @@ package android.telephony;
*/
public abstract class CellSignalStrength {
/** @hide */
public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0;
/** @hide */
public static final int SIGNAL_STRENGTH_POOR = 1;
/** @hide */
public static final int SIGNAL_STRENGTH_MODERATE = 2;
/** @hide */
public static final int SIGNAL_STRENGTH_GOOD = 3;
/** @hide */
public static final int SIGNAL_STRENGTH_GREAT = 4;
/** @hide */
public static final int NUM_SIGNAL_STRENGTH_BINS = 5;
/** @hide */
public static final String[] SIGNAL_STRENGTH_NAMES = {
"none", "poor", "moderate", "good", "great"
@@ -47,6 +48,12 @@ public abstract class CellSignalStrength {
/**
* Get signal level as an int from 0..4
* <p>
* @see SIGNAL_STRENGTH_NONE_OR_UNKNOWN
* @see SIGNAL_STRENGTH_POOR
* @see SIGNAL_STRENGTH_MODERATE
* @see SIGNAL_STRENGTH_GOOD
* @see SIGNAL_STRENGTH_GREAT
*/
public abstract int getLevel();