Merge "Support 3G ECNO thresholds in SignalStrengthController" (0f4605be) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SignalStrengthController.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,18 @@ public class SignalStrengthController extends Handler {
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		(nrMeasurementEnabled & CellSignalStrengthNr.USE_SSSINR) != 0));
		}

		int[] wcdmaEcnoThresholds = mCarrierConfig.getIntArray(
		CarrierConfigManager.KEY_WCDMA_ECNO_THRESHOLDS_INT_ARRAY);
		if (wcdmaEcnoThresholds != null) {
		signalThresholdInfos.add(
		createSignalThresholdsInfo(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_ECNO,
		wcdmaEcnoThresholds,
		AccessNetworkConstants.AccessNetworkType.UTRAN,
		false));
		}

		}

		consolidatedAndSetReportingCriteria(signalThresholdInfos);
		@@ -546,6 +558,12 @@ public class SignalStrengthController extends Handler {
		AccessNetworkThresholds.NGRAN_SSSINR,
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		false));
		signalThresholdInfos.add(
		createSignalThresholdsInfo(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_ECNO,
		AccessNetworkThresholds.UTRAN_ECNO,
		AccessNetworkConstants.AccessNetworkType.UTRAN,
		false));
		}

		consolidatedAndSetReportingCriteria(signalThresholdInfos);
		@@ -1108,6 +1126,16 @@ public class SignalStrengthController extends Handler {
		15, /* SIGNAL_STRENGTH_GOOD */
		30 /* SIGNAL_STRENGTH_GREAT */
		};

		/**
		* List of dBm thresholds for UTRAN {@link AccessNetworkConstants.AccessNetworkType} ECNO
		*/
		public static final int[] UTRAN_ECNO = new int[]{
		-24, /* SIGNAL_STRENGTH_POOR */
		-14, /* SIGNAL_STRENGTH_MODERATE */
		-6, /* SIGNAL_STRENGTH_GOOD */
		1 /* SIGNAL_STRENGTH_GREAT */
		};
		}

		private static void log(String msg) {