summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nathan Harold <nharold@google.com> 2018-03-02 20:02:41 -0800
committer Nathan Harold <nharold@google.com> 2018-03-06 12:11:57 -0800
commit7fa886db6a0afdab980fae38a08deb1a921b8efb (patch)
treef3b95c0b2404064abd55284809fa1453b939882d
parentd41feee9ce34158cd85d723ee598fef65fec5646 (diff)
Update SignalStrength to use ASU for TD-SDCMA
The HAL for Radio 1.2 uses -TD-SDCMA rather than ASU RSCP for the signal strength for TD-SCDMA. This change updates the HAL to use the new ASU-range input. Bug: 74202653 Test: runtest frameworks-telephony Change-Id: Iab37ca19daf12179933cef580f248c3ef8258b98 Merged-In: Iab37ca19daf12179933cef580f248c3ef8258b98 (cherry picked from commit 31135514ec884ede971c5bef01dfdc4817a2d46a)
-rw-r--r--telephony/java/android/telephony/SignalStrength.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index b4ba952430e1..ea2b0ae4e124 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -87,7 +87,7 @@ public class SignalStrength implements Parcelable {
private int mLteRsrq;
private int mLteRssnr;
private int mLteCqi;
- private int mTdScdmaRscp;
+ private int mTdScdmaRscp; // Valid values are -24...-120dBm or INVALID if unknown
private int mWcdmaSignalStrength;
private int mWcdmaRscpAsu; // the WCDMA RSCP in ASU as reported from the HAL
private int mWcdmaRscp; // the WCDMA RSCP in dBm
@@ -401,8 +401,8 @@ public class SignalStrength implements Parcelable {
mLteRssnr = ((mLteRssnr >= -200) && (mLteRssnr <= 300)) ? mLteRssnr
: SignalStrength.INVALID;
- mTdScdmaRscp = ((mTdScdmaRscp >= 25) && (mTdScdmaRscp <= 120))
- ? -mTdScdmaRscp : SignalStrength.INVALID;
+ mTdScdmaRscp = ((mTdScdmaRscp >= 0) && (mTdScdmaRscp <= 96))
+ ? (mTdScdmaRscp - 120) : SignalStrength.INVALID;
// Cqi no change
if (DBG) log("Signal after validate=" + this);
}