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

Merge "Add VDBG for CellSignalStrengthLte, and CellSignalStrengthNr"

Browse Source
This commit is contained in:
Shuo Qian
2020-02-20 00:06:04 +00:00
committed by Gerrit Code Review
parent 31d2ae697f ad7a410364
commit d09210b2e5
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
telephony/java/android/telephony/CellSignalStrengthLte.java
View File

@@ -244,19 +244,30 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
} else {
mParametersUseForLevel = cc.getInt(
CarrierConfigManager.KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT);
Rlog.i(LOG_TAG, "Using signal strength level: " + mParametersUseForLevel);
if (DBG) {
Rlog.i(LOG_TAG, "Using signal strength level: " + mParametersUseForLevel);
}
rsrpThresholds = cc.getIntArray(
CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY);
if (rsrpThresholds == null) rsrpThresholds = sRsrpThresholds;
Rlog.i(LOG_TAG, "Applying LTE RSRP Thresholds: " + Arrays.toString(rsrpThresholds));
if (DBG) {
Rlog.i(LOG_TAG, "Applying LTE RSRP Thresholds: "
+ Arrays.toString(rsrpThresholds));
}
rsrqThresholds = cc.getIntArray(
CarrierConfigManager.KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY);
if (rsrqThresholds == null) rsrqThresholds = sRsrqThresholds;
Rlog.i(LOG_TAG, "Applying LTE RSRQ Thresholds: " + Arrays.toString(rsrqThresholds));
if (DBG) {
Rlog.i(LOG_TAG, "Applying LTE RSRQ Thresholds: "
+ Arrays.toString(rsrqThresholds));
}
rssnrThresholds = cc.getIntArray(
CarrierConfigManager.KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY);
if (rssnrThresholds == null) rssnrThresholds = sRssnrThresholds;
Rlog.i(LOG_TAG, "Applying LTE RSSNR Thresholds: " + Arrays.toString(rssnrThresholds));
if (DBG) {
Rlog.i(LOG_TAG, "Applying LTE RSSNR Thresholds: "
+ Arrays.toString(rssnrThresholds));
}
rsrpOnly = cc.getBoolean(
CarrierConfigManager.KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false);
}
@@ -283,15 +294,21 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
if (isLevelForParameter(USE_RSRP)) {
rsrpLevel = updateLevelWithMeasure(rsrp, rsrpThresholds);
Rlog.i(LOG_TAG, "Updated 4G LTE RSRP Level: " + rsrpLevel);
if (DBG) {
Rlog.i(LOG_TAG, "Updated 4G LTE RSRP Level: " + rsrpLevel);
}
}
if (isLevelForParameter(USE_RSRQ)) {
rsrqLevel = updateLevelWithMeasure(mRsrq, rsrqThresholds);
Rlog.i(LOG_TAG, "Updated 4G LTE RSRQ Level: " + rsrqLevel);
if (DBG) {
Rlog.i(LOG_TAG, "Updated 4G LTE RSRQ Level: " + rsrqLevel);
}
}
if (isLevelForParameter(USE_RSSNR)) {
rssnrLevel = updateLevelWithMeasure(mRssnr, rssnrThresholds);
Rlog.i(LOG_TAG, "Updated 4G LTE RSSNR Level: " + rssnrLevel);
if (DBG) {
Rlog.i(LOG_TAG, "Updated 4G LTE RSSNR Level: " + rssnrLevel);
}
}
// Apply the smaller value among three levels of three measures.
mLevel = Math.min(Math.min(rsrpLevel, rsrqLevel), rssnrLevel);

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

@@ -40,6 +40,8 @@ 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 String TAG = "CellSignalStrengthNr";
// Lifted from Default carrier configs and max range of SSRSRP
@@ -301,31 +303,45 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
} else {
mParametersUseForLevel = cc.getInt(
CarrierConfigManager.KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT, USE_SSRSRP);
Rlog.i(TAG, "Using SSRSRP for Level.");
mSsRsrpThresholds = cc.getIntArray(
CarrierConfigManager.KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY);
Rlog.i(TAG, "Applying 5G NR SSRSRP Thresholds: " + Arrays.toString(mSsRsrpThresholds));
if (VDBG) {
Rlog.i(TAG, "Applying 5G NR SSRSRP Thresholds: "
+ Arrays.toString(mSsRsrpThresholds));
}
mSsRsrqThresholds = cc.getIntArray(
CarrierConfigManager.KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY);
Rlog.i(TAG, "Applying 5G NR SSRSRQ Thresholds: " + Arrays.toString(mSsRsrqThresholds));
if (VDBG) {
Rlog.i(TAG, "Applying 5G NR SSRSRQ Thresholds: "
+ Arrays.toString(mSsRsrqThresholds));
}
mSsSinrThresholds = cc.getIntArray(
CarrierConfigManager.KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY);
Rlog.i(TAG, "Applying 5G NR SSSINR Thresholds: " + Arrays.toString(mSsSinrThresholds));
if (VDBG) {
Rlog.i(TAG, "Applying 5G NR SSSINR Thresholds: "
+ Arrays.toString(mSsSinrThresholds));
}
}
int ssRsrpLevel = SignalStrength.INVALID;
int ssRsrqLevel = SignalStrength.INVALID;
int ssSinrLevel = SignalStrength.INVALID;
if (isLevelForParameter(USE_SSRSRP)) {
ssRsrpLevel = updateLevelWithMeasure(mSsRsrp, mSsRsrpThresholds);
Rlog.i(TAG, "Updated 5G NR SSRSRP Level: " + ssRsrpLevel);
if (VDBG) {
Rlog.i(TAG, "Updated 5G NR SSRSRP Level: " + ssRsrpLevel);
}
}
if (isLevelForParameter(USE_SSRSRQ)) {
ssRsrqLevel = updateLevelWithMeasure(mSsRsrq, mSsRsrqThresholds);
Rlog.i(TAG, "Updated 5G NR SSRSRQ Level: " + ssRsrqLevel);
if (VDBG) {
Rlog.i(TAG, "Updated 5G NR SSRSRQ Level: " + ssRsrqLevel);
}
}
if (isLevelForParameter(USE_SSSINR)) {
ssSinrLevel = updateLevelWithMeasure(mSsSinr, mSsSinrThresholds);
Rlog.i(TAG, "Updated 5G NR SSSINR Level: " + ssSinrLevel);
if (VDBG) {
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);