Merge "Update the usage due to the factoring in SignalThresholdInfo" (ab5bfd02) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −9

Original line number	Diff line number	Diff line
		@@ -628,26 +628,31 @@ public class DeviceStateMonitor extends Handler {
		}

		private void setSignalStrengthReportingCriteria() {
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSI,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSI,
		AccessNetworkThresholds.GERAN, AccessNetworkType.GERAN, true);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSCP,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSCP,
		AccessNetworkThresholds.UTRAN, AccessNetworkType.UTRAN, true);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSRP,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRP,
		AccessNetworkThresholds.EUTRAN_RSRP, AccessNetworkType.EUTRAN, true);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSI,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSI,
		AccessNetworkThresholds.CDMA2000, AccessNetworkType.CDMA2000, true);
		if (mPhone.getHalVersion().greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSRQ,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRQ,
		AccessNetworkThresholds.EUTRAN_RSRQ, AccessNetworkType.EUTRAN, false);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSNR,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSNR,
		AccessNetworkThresholds.EUTRAN_RSSNR, AccessNetworkType.EUTRAN, true);

		// Defaultly we only need SSRSRP for NGRAN signal criteria reporting
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRP,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRP,
		AccessNetworkThresholds.NGRAN_RSRSRP, AccessNetworkType.NGRAN, true);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRQ,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRQ,
		AccessNetworkThresholds.NGRAN_RSRSRQ, AccessNetworkType.NGRAN, false);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSSINR,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSSINR,
		AccessNetworkThresholds.NGRAN_SSSINR, AccessNetworkType.NGRAN, false);
		}
		}

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -4046,8 +4046,15 @@ public class GsmCdmaPhone extends Phone {
		@Override
		public void setSignalStrengthReportingCriteria(
		int signalStrengthMeasure, int[] thresholds, int ran, boolean isEnabled) {
		mCi.setSignalStrengthReportingCriteria(new SignalThresholdInfo(signalStrengthMeasure,
		REPORTING_HYSTERESIS_MILLIS, REPORTING_HYSTERESIS_DB, thresholds, isEnabled),
		mCi.setSignalStrengthReportingCriteria(
		new SignalThresholdInfo.Builder()
		.setRadioAccessNetworkType(ran)
		.setSignalMeasurementType(signalStrengthMeasure)
		.setHysteresisMs(REPORTING_HYSTERESIS_MILLIS)
		.setHysteresisDb(REPORTING_HYSTERESIS_DB)
		.setThresholds(thresholds)
		.setIsEnabled(isEnabled)
		.build(),
		ran, null);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -5319,7 +5319,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		SignalThresholdInfo signalThresholdInfo) {
		android.hardware.radio.V1_5.SignalThresholdInfo signalThresholdInfoHal =
		new android.hardware.radio.V1_5.SignalThresholdInfo();
		signalThresholdInfoHal.signalMeasurement = signalThresholdInfo.getSignalMeasurement();
		signalThresholdInfoHal.signalMeasurement = signalThresholdInfo.getSignalMeasurementType();
		signalThresholdInfoHal.hysteresisMs = signalThresholdInfo.getHysteresisMs();
		signalThresholdInfoHal.hysteresisDb = signalThresholdInfo.getHysteresisDb();
		signalThresholdInfoHal.thresholds = primitiveArrayToArrayList(

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -4924,38 +4924,43 @@ public class ServiceStateTracker extends Handler {
		private void updateReportingCriteria(PersistableBundle config) {
		int lteMeasurementEnabled = config.getInt(CarrierConfigManager
		.KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, CellSignalStrengthLte.USE_RSRP);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSRP,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRP,
		config.getIntArray(CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.EUTRAN,
		(lteMeasurementEnabled & CellSignalStrengthLte.USE_RSRP) != 0);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSCP,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSCP,
		config.getIntArray(CarrierConfigManager.KEY_WCDMA_RSCP_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.UTRAN, true);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSI,
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSI,
		config.getIntArray(CarrierConfigManager.KEY_GSM_RSSI_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.GERAN, true);

		if (mPhone.getHalVersion().greaterOrEqual(RIL.RADIO_HAL_VERSION_1_5)) {
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSRQ,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSRQ,
		config.getIntArray(CarrierConfigManager.KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.EUTRAN,
		(lteMeasurementEnabled & CellSignalStrengthLte.USE_RSRQ) != 0);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_RSSNR,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_RSSNR,
		config.getIntArray(CarrierConfigManager.KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.EUTRAN,
		(lteMeasurementEnabled & CellSignalStrengthLte.USE_RSSNR) != 0);

		int measurementEnabled = config.getInt(CarrierConfigManager
		.KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT, CellSignalStrengthNr.USE_SSRSRP);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRP,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRP,
		config.getIntArray(CarrierConfigManager.KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.NGRAN,
		(measurementEnabled & CellSignalStrengthNr.USE_SSRSRP) != 0);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSRSRQ,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSRSRQ,
		config.getIntArray(CarrierConfigManager.KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.NGRAN,
		(measurementEnabled & CellSignalStrengthNr.USE_SSRSRQ) != 0);
		mPhone.setSignalStrengthReportingCriteria(SignalThresholdInfo.SIGNAL_SSSINR,
		mPhone.setSignalStrengthReportingCriteria(
		SignalThresholdInfo.SIGNAL_MEASUREMENT_TYPE_SSSINR,
		config.getIntArray(CarrierConfigManager.KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY),
		AccessNetworkType.NGRAN,
		(measurementEnabled & CellSignalStrengthNr.USE_SSSINR) != 0);

tests/telephonytests/src/com/android/internal/telephony/SignalThresholdInfoTest.java

+320 −51

File changed.

Preview size limit exceeded, changes collapsed.