diff options
| author | Casey Ho <caseyho@google.com> | 2015-07-06 21:39:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 21:39:31 +0000 |
| commit | becddea63e2c4b414e5eac2841d3516c4e89bb24 (patch) | |
| tree | 79dbab31e6b0273c9082c5ff48f7e9171ce06b2c | |
| parent | f9fc53bb6f46ab89fb058c41d162b43ee9799314 (diff) | |
| parent | 8e27050f0ebb27b920dfc918635130865dba0eac (diff) | |
Merge "Unhide signal strength constants used by getLevel." into mnc-dev
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | api/system-current.txt | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CellSignalStrength.java | 17 |
3 files changed, 22 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index bb1070da4959..ba1d0eb52c6b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 { diff --git a/api/system-current.txt b/api/system-current.txt index 5861560edbfd..63c28c17becd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 { diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java index 9c23f785d243..2a3ef2197706 100644 --- a/telephony/java/android/telephony/CellSignalStrength.java +++ b/telephony/java/android/telephony/CellSignalStrength.java @@ -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(); |