Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a96802 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Fix signal threshold boundaries for NR" am: 865dcdbf 

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



Change-Id: I8df3b9ae27b311e07b2d2ea6b42af0076c74f4e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1f8e1c5 865dcdbf

telephony/java/android/telephony/CarrierConfigManager.java

+15 −15
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/CellSignalStrengthNr.java

+4 −4
Original line number Diff line number Diff line
@@ -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;