Fix signal threshold boundaries for NR

Aligns the threshold boundaries of 5G NR signals with LTE

Test: manual
Test: auto - atest FrameworksTelephonyTests:CellSignalStrengthNrTest
atest FrameworksTelephonyTests:SignalStrengthTest
atest FrameworksTelephonyTests:SignalStrengthControllerTest
Bug: 214413103

Change-Id: I5d9c81b04f404120f5d9e42109822945bc2919e3
This commit is contained in:
Yang Cao
2021-12-17 10:26:32 +08:00
committed by Sooraj Sasindran
parent b8e11a0afd
commit af14d7c242
2 changed files with 19 additions and 19 deletions

View File

@@ -2846,11 +2846,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
@@ -2866,11 +2866,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
@@ -2887,11 +2887,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

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;