Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix signal threshold boundaries for NR" am: 865dcdbfb0 am: 76a9680291

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2018775

Change-Id: I6c5c5abaa5aa8f645baa38a5cfccd9dcad0c1c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sooraj Sasindran
2022-04-18 18:44:00 +00:00
committed by Automerger Merge Worker
parent a08368b334 76a9680291
commit 89c5ba1424
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2853,11 +2853,11 @@ public class CarrierConfigManager {
* <p>
* 4 threshold integers must be within the boundaries [-140 dB, -44 dB], and the levels are:
* <UL>
* <LI>"NONE: [-140, threshold1]"</LI>
* <LI>"POOR: (threshold1, threshold2]"</LI>
* <LI>"MODERATE: (threshold2, threshold3]"</LI>
* <LI>"GOOD: (threshold3, threshold4]"</LI>
* <LI>"EXCELLENT: (threshold4, -44]"</LI>
* <LI>"NONE: [-140, threshold1)"</LI>
* <LI>"POOR: [threshold1, threshold2)"</LI>
* <LI>"MODERATE: [threshold2, threshold3)"</LI>
* <LI>"GOOD: [threshold3, threshold4)"</LI>
* <LI>"EXCELLENT: [threshold4, -44]"</LI>
* </UL>
* <p>
* This key is considered invalid if the format is violated. If the key is invalid or
@@ -2873,11 +2873,11 @@ public class CarrierConfigManager {
* <p>
* 4 threshold integers must be within the boundaries [-43 dB, 20 dB], and the levels are:
* <UL>
* <LI>"NONE: [-43, threshold1]"</LI>
* <LI>"POOR: (threshold1, threshold2]"</LI>
* <LI>"MODERATE: (threshold2, threshold3]"</LI>
* <LI>"GOOD: (threshold3, threshold4]"</LI>
* <LI>"EXCELLENT: (threshold4, 20]"</LI>
* <LI>"NONE: [-43, threshold1)"</LI>
* <LI>"POOR: [threshold1, threshold2)"</LI>
* <LI>"MODERATE: [threshold2, threshold3)"</LI>
* <LI>"GOOD: [threshold3, threshold4)"</LI>
* <LI>"EXCELLENT: [threshold4, 20]"</LI>
* </UL>
* <p>
* This key is considered invalid if the format is violated. If the key is invalid or
@@ -2894,11 +2894,11 @@ public class CarrierConfigManager {
* <p>
* 4 threshold integers must be within the boundaries [-23 dB, 40 dB], and the levels are:
* <UL>
* <LI>"NONE: [-23, threshold1]"</LI>
* <LI>"POOR: (threshold1, threshold2]"</LI>
* <LI>"MODERATE: (threshold2, threshold3]"</LI>
* <LI>"GOOD: (threshold3, threshold4]"</LI>
* <LI>"EXCELLENT: (threshold4, 40]"</LI>
* <LI>"NONE: [-23, threshold1)"</LI>
* <LI>"POOR: [threshold1, threshold2)"</LI>
* <LI>"MODERATE: [threshold2, threshold3)"</LI>
* <LI>"GOOD: [threshold3, threshold4)"</LI>
* <LI>"EXCELLENT: [threshold4, 40]"</LI>
* </UL>
* <p>
* This key is considered invalid if the format is violated. If the key is invalid or

8
telephony/java/android/telephony/CellSignalStrengthNr.java
View File

@@ -438,13 +438,13 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
int level;
if (measure == CellInfo.UNAVAILABLE) {
level = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
} else if (measure > thresholds[3]) {
} else if (measure >= thresholds[3]) {
level = SIGNAL_STRENGTH_GREAT;
} else if (measure > thresholds[2]) {
} else if (measure >= thresholds[2]) {
level = SIGNAL_STRENGTH_GOOD;
} else if (measure > thresholds[1]) {
} else if (measure >= thresholds[1]) {
level = SIGNAL_STRENGTH_MODERATE;
} else if (measure > thresholds[0]) {
} else if (measure >= thresholds[0]) {
level = SIGNAL_STRENGTH_POOR;
} else {
level = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;