diff --git a/frameworks/base/telephony/java/android/telephony/CarrierConfigManager.java b/frameworks/base/telephony/java/android/telephony/CarrierConfigManager.java
index eaf1228681..76c8f792db 100755
--- a/frameworks/base/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/frameworks/base/telephony/java/android/telephony/CarrierConfigManager.java
@@ -4434,11 +4434,17 @@ public class CarrierConfigManager {
});
sDefaults.putIntArray(KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY,
// Boundaries: [-140 dB, -44 dB]
- new int[] {
- -110,
- -90,
- -80,
- -65,
+ //new int[] {
+ // -110,
+ // -90,
+ // -80,
+ // -65,
+ //});
+ new int[] {
+ -120,
+ -113,
+ -103,
+ -97,
});
sDefaults.putIntArray(KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY,
// Boundaries: [-43 dB, 20 dB]
diff --git a/frameworks/base/telephony/java/android/telephony/CellSignalStrengthNr.java b/frameworks/base/telephony/java/android/telephony/CellSignalStrengthNr.java
index 766019ec38..755e2f97c0 100644
--- a/frameworks/base/telephony/java/android/telephony/CellSignalStrengthNr.java
+++ b/frameworks/base/telephony/java/android/telephony/CellSignalStrengthNr.java
@@ -40,17 +40,24 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
*/
public static final int UNKNOWN_ASU_LEVEL = 99;
- private static final boolean VDBG = false;
+ private static final boolean VDBG = true;
private static final String TAG = "CellSignalStrengthNr";
// Lifted from Default carrier configs and max range of SSRSRP
// Boundaries: [-140 dB, -44 dB]
- private int[] mSsRsrpThresholds = new int[] {
- -110,
- -90,
- -80,
- -65,
+ //private int[] mSsRsrpThresholds = new int[] {
+ // -110,
+ // -90,
+ // -80,
+ // -65,
+ // };
+
+ private int[] mSsRsrpThresholds = new int[] {
+ -120,
+ -113,
+ -103,
+ -97,
};
// Lifted from Default carrier configs and max range of SSRSRQ
@@ -276,6 +283,9 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
@Override
@IntRange(from = SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to = SIGNAL_STRENGTH_GREAT)
public int getLevel() {
return mLevel;
}
@@ -298,6 +308,9 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
@Override
public void updateLevel(PersistableBundle cc, ServiceState ss) {
if (cc == null) {
mParametersUseForLevel = USE_SSRSRP;
} else {
@@ -343,6 +356,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
Rlog.i(TAG, "Updated 5G NR SSSINR Level: " + ssSinrLevel);
}
}
// Apply the smaller value among three levels of three measures.
mLevel = Math.min(Math.min(ssRsrpLevel, ssRsrqLevel), ssSinrLevel);
}