summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-10-11 02:50:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-11 02:50:08 +0000
commit1ea2aeda29a247de56e7991d16a4ae12d9aff8f1 (patch)
treeee0c6e82507fe5c4b9f631ffe824b398960d9a7c /telephony/java
parent1eeec4e4ea4684d96b88828e14e7cbea48dd749d (diff)
parent589a4896b0c45f03604db1eb0292ef1c936adaff (diff)
downloadframeworks_base-1ea2aeda29a247de56e7991d16a4ae12d9aff8f1.zip
frameworks_base-1ea2aeda29a247de56e7991d16a4ae12d9aff8f1.tar.gz
frameworks_base-1ea2aeda29a247de56e7991d16a4ae12d9aff8f1.tar.bz2
am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev
* commit '589a4896b0c45f03604db1eb0292ef1c936adaff': Fix to show low LTE signal strength as -140 instead of 0.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/SignalStrength.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 7b9cf4e..3363ca6 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -533,10 +533,9 @@ public class SignalStrength implements Parcelable {
int dBm;
if(isGsm()) {
- if (getLteLevel() == SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {
+ dBm = getLteDbm();
+ if (dBm == INVALID) {
dBm = getGsmDbm();
- } else {
- dBm = getLteDbm();
}
} else {
int cdmaDbm = getCdmaDbm();