blob: b13082ffc87d165d3b20980cb80efdd4ef058b14 [file] [log] [blame]
Jackeaglea3ae16b2018-12-04 11:30:49 -05001From baa43b505d69d7d5dadf13bdb25d97eac8145d5f Mon Sep 17 00:00:00 2001
Jon West013ef582018-08-21 20:45:26 -04002From: Pierre-Hugues Husson <phh@phh.me>
3Date: Mon, 6 Aug 2018 20:01:44 +0200
Jackeaglea3ae16b2018-12-04 11:30:49 -05004Subject: [PATCH 14/24] Change SignalStrentgh to change behaviour based on
Jon West013ef582018-08-21 20:45:26 -04005 property
6
7Change-Id: I940ed724047567ec5195ac93ea04574c3d92f70b
Jackeaglea3ae16b2018-12-04 11:30:49 -05008Signed-off-by: Jackeagle <jackeagle102@gmail.com>
Jon West013ef582018-08-21 20:45:26 -04009---
Jackeagled3ba2282018-11-17 20:49:22 -070010 .../android/telephony/SignalStrength.java | 39 +++++++++++++------
Jon West013ef582018-08-21 20:45:26 -040011 1 file changed, 27 insertions(+), 12 deletions(-)
12
13diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
Jackeaglea3ae16b2018-12-04 11:30:49 -050014index 55c0c778972..69bc6128da6 100644
Jon West013ef582018-08-21 20:45:26 -040015--- a/telephony/java/android/telephony/SignalStrength.java
16+++ b/telephony/java/android/telephony/SignalStrength.java
17@@ -854,6 +854,7 @@ public class SignalStrength implements Parcelable {
18 * RSRQ = quality of signal dB = Number of Resource blocks*RSRP/RSSI
19 * SNR = gain = signal/noise ratio = -10log P1/P2 dB
20 */
21+ String method = android.os.SystemProperties.get("persist.sys.signal.level", "default");
22 int rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN, rsrpIconLevel = -1, snrIconLevel = -1;
23
24 if (mLteRsrp > MAX_LTE_RSRP || mLteRsrp < MIN_LTE_RSRP) {
Jackeaglea3ae16b2018-12-04 11:30:49 -050025@@ -900,6 +901,32 @@ public class SignalStrength implements Parcelable {
26 /* Ignore RSSNR for now */
27 if(rsrpIconLevel != -1) return rsrpIconLevel;
Jon West013ef582018-08-21 20:45:26 -040028
29+ /* Valid values are (0-63, 99) as defined in TS 36.331 */
30+ // TODO the range here is probably supposed to be (0..31, 99). It's unclear if anyone relies
31+ // on the current incorrect range check, so this will be fixed in a future release with more
32+ // soak time
33+ if (mLteSignalStrength > 63) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
34+ else if (mLteSignalStrength >= 12) rssiIconLevel = SIGNAL_STRENGTH_GREAT;
35+ else if (mLteSignalStrength >= 8) rssiIconLevel = SIGNAL_STRENGTH_GOOD;
36+ else if (mLteSignalStrength >= 5) rssiIconLevel = SIGNAL_STRENGTH_MODERATE;
37+ else if (mLteSignalStrength >= 0) rssiIconLevel = SIGNAL_STRENGTH_POOR;
38+
39+ if (DBG) log("getLTELevel - rssi:" + mLteSignalStrength + " rssiIconLevel:"
40+ + rssiIconLevel);
41+
42+ if("rsrp".equals(method)) {
43+ if(rsrpIconLevel == -1) rsrpIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
44+ return rsrpIconLevel;
45+ }
46+ if("rssnr".equals(method)) {
47+ if(snrIconLevel == -1) snrIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
48+ return snrIconLevel;
49+ }
50+ if("rssi".equals(method)) {
51+ if(rssiIconLevel == -1) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
52+ return rssiIconLevel;
53+ }
54+
55 /* Choose a measurement type to use for notification */
56 if (snrIconLevel != -1 && rsrpIconLevel != -1) {
57 /*
Jackeaglea3ae16b2018-12-04 11:30:49 -050058@@ -914,18 +941,6 @@ public class SignalStrength implements Parcelable {
Jon West013ef582018-08-21 20:45:26 -040059
60 if (rsrpIconLevel != -1) return rsrpIconLevel;
61
62- /* Valid values are (0-63, 99) as defined in TS 36.331 */
63- // TODO the range here is probably supposed to be (0..31, 99). It's unclear if anyone relies
64- // on the current incorrect range check, so this will be fixed in a future release with more
65- // soak time
66- if (mLteSignalStrength > 63) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
67- else if (mLteSignalStrength >= 12) rssiIconLevel = SIGNAL_STRENGTH_GREAT;
68- else if (mLteSignalStrength >= 8) rssiIconLevel = SIGNAL_STRENGTH_GOOD;
69- else if (mLteSignalStrength >= 5) rssiIconLevel = SIGNAL_STRENGTH_MODERATE;
70- else if (mLteSignalStrength >= 0) rssiIconLevel = SIGNAL_STRENGTH_POOR;
71-
72- if (DBG) log("getLteLevel - rssi:" + mLteSignalStrength + " rssiIconLevel:"
73- + rssiIconLevel);
74 return rssiIconLevel;
75
76 }
77--
Jackeagled3ba2282018-11-17 20:49:22 -0700782.17.1
Jon West013ef582018-08-21 20:45:26 -040079