Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev (bc0269bd) · Commits · e / os / android_frameworks_opt_telephony

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

+19 −5

Original line number	Diff line number	Diff line
		@@ -5275,8 +5275,19 @@ public class RIL extends BaseCommands implements CommandsInterface {
		return response;
		}

		static SignalStrength convertHalSignalStrength(
		/** Convert HAL 1.0 Signal Strength to android SignalStrength */
		@VisibleForTesting
		public static SignalStrength convertHalSignalStrength(
		android.hardware.radio.V1_0.SignalStrength signalStrength) {
		int tdscdmaRscp_1_2 = 255; // 255 is the value for unknown/unreported ASU.
		// The HAL 1.0 range is 25..120; the ASU/ HAL 1.2 range is 0..96;
		// yes, this means the range in 1.0 cannot express -24dBm = 96
		if (signalStrength.tdScdma.rscp >= 25 && signalStrength.tdScdma.rscp <= 120) {
		// First we flip the sign to convert from the HALs -rscp to the actual RSCP value.
		int rscpDbm = -signalStrength.tdScdma.rscp;
		// Then to convert from RSCP to ASU, we apply the offset which aligns 0 ASU to -120dBm.
		tdscdmaRscp_1_2 = rscpDbm + 120;
		}
		return new SignalStrength(
		signalStrength.gw.signalStrength,
		signalStrength.gw.bitErrorRate,
		@@ -5290,12 +5301,13 @@ public class RIL extends BaseCommands implements CommandsInterface {
		signalStrength.lte.rsrq,
		signalStrength.lte.rssnr,
		signalStrength.lte.cqi,
		signalStrength.tdScdma.rscp);
		tdscdmaRscp_1_2);
		}

		static SignalStrength convertHalSignalStrength_1_2(
		/** Convert HAL 1.2 Signal Strength to android SignalStrength */
		@VisibleForTesting
		public static SignalStrength convertHalSignalStrength_1_2(
		android.hardware.radio.V1_2.SignalStrength signalStrength) {
		// TODO: Pipe WCDMA up
		return new SignalStrength(
		signalStrength.gsm.signalStrength,
		signalStrength.gsm.bitErrorRate,
		@@ -5309,6 +5321,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
		signalStrength.lte.rsrq,
		signalStrength.lte.rssnr,
		signalStrength.lte.cqi,
		signalStrength.tdScdma.rscp);
		signalStrength.tdScdma.rscp,
		signalStrength.wcdma.base.signalStrength,
		signalStrength.wcdma.rscp);
		}
		}

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

+10 −22

Original line number	Diff line number	Diff line
		@@ -3945,8 +3945,16 @@ public class ServiceStateTracker extends Handler {
		mSignalStrength.setGsm(isGsm);
		}
		mSignalStrength.setLteRsrpBoost(mSS.getLteEarfcnRsrpBoost());
		mSignalStrength.setUseOnlyRsrpForLteLevel(isUseOnlyRsrpForLteLevel());
		mSignalStrength.setLteRsrpThresholds(getLteRsrpThresholds());

		PersistableBundle config = getCarrierConfig();
		mSignalStrength.setUseOnlyRsrpForLteLevel(config.getBoolean(
		CarrierConfigManager.KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL));
		mSignalStrength.setLteRsrpThresholds(config.getIntArray(
		CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY));
		mSignalStrength.setWcdmaDefaultSignalMeasurement(config.getString(
		CarrierConfigManager.KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING));
		mSignalStrength.setWcdmaRscpThresholds(config.getIntArray(
		CarrierConfigManager.KEY_WCDMA_RSCP_THRESHOLDS_INT_ARRAY));
		} else {
		log("onSignalStrengthResult() Exception from RIL : " + ar.exception);
		mSignalStrength = new SignalStrength(isGsm);
		@@ -4519,26 +4527,6 @@ public class ServiceStateTracker extends Handler {
		return regState;
		}

		/**
		* Check whether to use only RSRP for the number of LTE signal bar.
		*
		* @return true if it should use only RSRP for the number of LTE signal bar.
		*/
		private boolean isUseOnlyRsrpForLteLevel() {
		return getCarrierConfig().getBoolean(
		CarrierConfigManager.KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL);
		}

		/**
		* Gets the threshold array for determining the display level of LTE signal bar.
		*
		* @return int array for determining the display level.
		*/
		private int[] getLteRsrpThresholds() {
		return getCarrierConfig().getIntArray(
		CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY);
		}

		/**
		* Gets the carrier configuration values for a particular subscription.
		*

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

+58 −0

Original line number	Diff line number	Diff line
		@@ -1564,4 +1564,62 @@ public class RILTest extends TelephonyTest {

		return RIL.convertHalCellInfoList_1_2(records);
		}

		public android.telephony.SignalStrength getTdScdmaSignalStrength_1_0(int tdscdmaNegDbm) {
		android.hardware.radio.V1_0.SignalStrength halSs =
		new android.hardware.radio.V1_0.SignalStrength();
		halSs.lte.signalStrength = SIGNAL_STRENGTH;
		halSs.lte.rsrp = RSRP;
		halSs.lte.rsrq = RSRQ;
		halSs.lte.rssnr = RSSNR;
		halSs.gw.signalStrength = SIGNAL_STRENGTH;
		halSs.gw.bitErrorRate = BIT_ERROR_RATE;
		halSs.cdma.dbm = DBM;
		halSs.cdma.ecio = ECIO;
		halSs.evdo.dbm = DBM;
		halSs.evdo.ecio = ECIO;
		halSs.evdo.signalNoiseRatio = SIGNAL_NOISE_RATIO;
		halSs.tdScdma.rscp = tdscdmaNegDbm;
		android.telephony.SignalStrength ss = RIL.convertHalSignalStrength(halSs);
		// FIXME: We should not need to call validateInput here b/74115980.
		ss.validateInput();
		return ss;
		}

		public android.telephony.SignalStrength getTdScdmaSignalStrength_1_2(int tdscdmaAsu) {
		android.hardware.radio.V1_2.SignalStrength halSs =
		new android.hardware.radio.V1_2.SignalStrength();
		halSs.lte.signalStrength = SIGNAL_STRENGTH;
		halSs.lte.rsrp = RSRP;
		halSs.lte.rsrq = RSRQ;
		halSs.lte.rssnr = RSSNR;
		halSs.gsm.signalStrength = SIGNAL_STRENGTH;
		halSs.gsm.bitErrorRate = BIT_ERROR_RATE;
		halSs.cdma.dbm = DBM;
		halSs.cdma.ecio = ECIO;
		halSs.evdo.dbm = DBM;
		halSs.evdo.ecio = ECIO;
		halSs.evdo.signalNoiseRatio = SIGNAL_NOISE_RATIO;
		halSs.wcdma.base.signalStrength = 99;
		halSs.wcdma.rscp = 255;
		halSs.tdScdma.rscp = tdscdmaAsu;
		android.telephony.SignalStrength ss = RIL.convertHalSignalStrength_1_2(halSs);
		// FIXME: We should not need to call validateInput here b/74115980
		// but unless we call it, we have to pass Integer.MAX_VALUE for wcdma RSCP,
		// which is outside the allowable range for the HAL. This value is being
		// coerced inside SignalStrength.validateInput().
		ss.validateInput();
		return ss;
		}

		@Test
		public void testHalSignalStrengthTdScdma() throws Exception {
		// Check that the minimum value is the same.
		assertEquals(getTdScdmaSignalStrength_1_0(120), getTdScdmaSignalStrength_1_2(0));
		// Check that the maximum common value is the same.
		assertEquals(getTdScdmaSignalStrength_1_0(25), getTdScdmaSignalStrength_1_2(95));
		// Check that an invalid value is the same.
		assertEquals(getTdScdmaSignalStrength_1_0(-1), getTdScdmaSignalStrength_1_2(255));
		}

		}

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

+142 −0

Original line number	Diff line number	Diff line
		@@ -427,6 +427,148 @@ public class ServiceStateTrackerTest extends TelephonyTest {
		assertEquals(sst.getSignalStrength().isGsm(), false);
		}

		@Test
		@MediumTest
		public void testSignalLevelWithWcdmaRscpThresholds() {
		mBundle.putIntArray(CarrierConfigManager.KEY_WCDMA_RSCP_THRESHOLDS_INT_ARRAY,
		new int[] {
		-110, /* SIGNAL_STRENGTH_POOR */
		-100, /* SIGNAL_STRENGTH_MODERATE */
		-90, /* SIGNAL_STRENGTH_GOOD */
		-80 /* SIGNAL_STRENGTH_GREAT */
		});
		mBundle.putString(
		CarrierConfigManager.KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING,
		"rscp");

		SignalStrength ss = new SignalStrength(
		30, // gsmSignalStrength
		0, // gsmBitErrorRate
		-1, // cdmaDbm
		-1, // cdmaEcio
		-1, // evdoDbm
		-1, // evdoEcio
		-1, // evdoSnr
		99, // lteSignalStrength
		SignalStrength.INVALID, // lteRsrp
		SignalStrength.INVALID, // lteRsrq
		SignalStrength.INVALID, // lteRssnr
		SignalStrength.INVALID, // lteCqi
		SignalStrength.INVALID, // tdScdmaRscp
		99, // wcdmaSignalStrength
		45 // wcdmaRscpAsu
		);
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		waitForMs(300);
		assertEquals(sst.getSignalStrength(), ss);
		assertEquals(sst.getSignalStrength().getWcdmaLevel(), SignalStrength.SIGNAL_STRENGTH_GREAT);
		assertEquals(sst.getSignalStrength().getWcdmaAsuLevel(), 45);
		assertEquals(sst.getSignalStrength().getWcdmaDbm(), -75);

		ss = new SignalStrength(
		30, // gsmSignalStrength
		0, // gsmBitErrorRate
		-1, // cdmaDbm
		-1, // cdmaEcio
		-1, // evdoDbm
		-1, // evdoEcio
		-1, // evdoSnr
		99, // lteSignalStrength
		SignalStrength.INVALID, // lteRsrp
		SignalStrength.INVALID, // lteRsrq
		SignalStrength.INVALID, // lteRssnr
		SignalStrength.INVALID, // lteCqi
		SignalStrength.INVALID, // tdScdmaRscp
		99, // wcdmaSignalStrength
		35 // wcdmaRscpAsu
		);
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		waitForMs(300);
		assertEquals(sst.getSignalStrength(), ss);
		assertEquals(sst.getSignalStrength().getWcdmaLevel(), SignalStrength.SIGNAL_STRENGTH_GOOD);
		assertEquals(sst.getSignalStrength().getWcdmaAsuLevel(), 35);
		assertEquals(sst.getSignalStrength().getWcdmaDbm(), -85);

		ss = new SignalStrength(
		30, // gsmSignalStrength
		0, // gsmBitErrorRate
		-1, // cdmaDbm
		-1, // cdmaEcio
		-1, // evdoDbm
		-1, // evdoEcio
		-1, // evdoSnr
		99, // lteSignalStrength
		SignalStrength.INVALID, // lteRsrp
		SignalStrength.INVALID, // lteRsrq
		SignalStrength.INVALID, // lteRssnr
		SignalStrength.INVALID, // lteCqi
		SignalStrength.INVALID, // tdScdmaRscp
		99, // wcdmaSignalStrength
		25 // wcdmaRscpAsu
		);
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		waitForMs(300);
		assertEquals(sst.getSignalStrength(), ss);
		assertEquals(sst.getSignalStrength().getWcdmaLevel(),
		SignalStrength.SIGNAL_STRENGTH_MODERATE);
		assertEquals(sst.getSignalStrength().getWcdmaAsuLevel(), 25);
		assertEquals(sst.getSignalStrength().getWcdmaDbm(), -95);

		ss = new SignalStrength(
		30, // gsmSignalStrength
		0, // gsmBitErrorRate
		-1, // cdmaDbm
		-1, // cdmaEcio
		-1, // evdoDbm
		-1, // evdoEcio
		-1, // evdoSnr
		99, // lteSignalStrength
		SignalStrength.INVALID, // lteRsrp
		SignalStrength.INVALID, // lteRsrq
		SignalStrength.INVALID, // lteRssnr
		SignalStrength.INVALID, // lteCqi
		SignalStrength.INVALID, // tdScdmaRscp
		99, // wcdmaSignalStrength
		15 // wcdmaRscpAsu
		);
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		waitForMs(300);
		assertEquals(sst.getSignalStrength(), ss);
		assertEquals(sst.getSignalStrength().getWcdmaLevel(), SignalStrength.SIGNAL_STRENGTH_POOR);
		assertEquals(sst.getSignalStrength().getWcdmaAsuLevel(), 15);
		assertEquals(sst.getSignalStrength().getWcdmaDbm(), -105);

		ss = new SignalStrength(
		30, // gsmSignalStrength
		0, // gsmBitErrorRate
		-1, // cdmaDbm
		-1, // cdmaEcio
		-1, // evdoDbm
		-1, // evdoEcio
		-1, // evdoSnr
		99, // lteSignalStrength
		SignalStrength.INVALID, // lteRsrp
		SignalStrength.INVALID, // lteRsrq
		SignalStrength.INVALID, // lteRssnr
		SignalStrength.INVALID, // lteCqi
		SignalStrength.INVALID, // tdScdmaRscp
		99, // wcdmaSignalStrength
		5 // wcdmaRscpAsu
		);
		mSimulatedCommands.setSignalStrength(ss);
		mSimulatedCommands.notifySignalStrength();
		waitForMs(300);
		assertEquals(sst.getSignalStrength(), ss);
		assertEquals(sst.getSignalStrength().getWcdmaLevel(),
		SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
		assertEquals(sst.getSignalStrength().getWcdmaAsuLevel(), 5);
		assertEquals(sst.getSignalStrength().getWcdmaDbm(), -115);
		}

		@Test
		@MediumTest
		public void testGsmCellLocation() {

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

+19 −16

Original line number	Diff line number	Diff line
		@@ -63,9 +63,12 @@ public class SignalStrengthTest {
		-115, // lteRssnr
		13, // lteCqi
		-90, // tdscdmaRscp
		45, // wcdmaSignalStrength
		20, // wcdmaRscpAsu
		2, // lteRsrpBoost
		false, // gsmFlag
		true); // lteLevelBaseOnRsrp
		true, // lteLevelBaseOnRsrp
		"rscp"); // wcdmaDefaultMeasurement
		assertParcelingIsLossless(s);
		}